rpms/l2tpd/devel l2tpd-MSL2TP-StopCCN.patch,NONE,1.1

[Paul Wouters (pwouters)]

Author: pwouters

Update of /cvs/extras/rpms/l2tpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18657

Added Files:
	l2tpd-MSL2TP-StopCCN.patch 
Log Message:
l2tpd-MSL2TP-StopCCN.patch


l2tpd-MSL2TP-StopCCN.patch:

--- NEW FILE l2tpd-MSL2TP-StopCCN.patch ---
*** a/control.c	2006-02-21 01:26:12.000000000 -0500
--- b/control.c	2006-02-20 19:03:55.000000000 -0500
***************
*** 183,188 ****
--- 183,190 ----
      char ip1[STRLEN];
      char ip2[STRLEN];
      char dummy_buf[128] = "/var/l2tp/"; /* jz: needed to read /etc/ppp/var.options - just kick it if you dont like */
+     int tmptid,tmpcid;
+ 
      if (c->msgtype < 0)
      {
          l2tp_log (LOG_DEBUG, "%s: Whoa...  non-ZLB with no message type!\n",
***************
*** 669,680 ****
              return -EINVAL;
          }
  
!         if ((t->qtid != t->ourtid) && (t->ourtid > 0))
          {
              if (DEBUG)
                  l2tp_log (LOG_DEBUG,
                       "%s: Peer tried to disconnect with invalid TID (%d != %d)\n",
!                      __FUNCTION__, t->qtid, t->ourtid);
              return -EINVAL;
          }
          /* In case they're disconnecting immediately after SCCN */
--- 671,687 ----
              return -EINVAL;
          }
  
!        /* Work around bug in MSL2TP client */
!         if ((t->firmware == 0xff00) && (!(strncmp(t->vendor, "Deterministic Networks Inc.", 27))))
!             tmptid = t->ourtid;
!         else
!             tmptid = t->tid;
!         if ((t->qtid != tmptid) && (tmptid > 0))
          {
              if (DEBUG)
                  l2tp_log (LOG_DEBUG,
                       "%s: Peer tried to disconnect with invalid TID (%d != %d)\n",
!                      __FUNCTION__, t->qtid, tmptid);
              return -EINVAL;
          }
          /* In case they're disconnecting immediately after SCCN */
***************
*** 1074,1080 ****
              p = c;
  	}
  
!         if ((c->qcid != p->cid) && p->ourcid > 0)
          {
              if (DEBUG)
                  l2tp_log (LOG_DEBUG,
--- 1081,1093 ----
              p = c;
  	}
  
!        /* Work around bug in MSL2TP client */
!         if ((t->firmware == 0xff00) && (!(strncmp(t->vendor, "Deterministic Networks Inc.", 27))))
!             tmpcid = p->ourcid;
!         else
!             tmpcid = p->cid;
! 
!         if ((c->qcid != tmpcid) && tmpcid > 0)
          {
              if (DEBUG)
                  l2tp_log (LOG_DEBUG,