// L2TPNS PPP Stuff
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.55 2005/05/10 09:35:27 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.57 2005/05/10 09:57:19 bodea Exp $";
#include <stdio.h>
#include <string.h>
if (*p == ConfigAck)
{
- LOG(3, s, t, "LCP: Discarding ConfigAck\n");
+ int x = l - 4;
+ uint8_t *o = (p + 4);
+ int authtype = 0;
+
+ LOG(3, s, t, "LCP: ConfigAck (%d bytes)...\n", l);
+ if (config->debug > 3) dumplcp(p, l);
+
+ while (x > 2)
+ {
+ int type = o[0];
+ int length = o[1];
+
+ if (length == 0 || type == 0 || x < length) break;
+ switch (type)
+ {
+ case 3: // Authentication-Protocol
+ {
+ int proto = ntohs(*(uint16_t *)(o + 2));
+ if (proto == PPPCHAP && *(o + 4) == 5)
+ sendchap(t, s);
+ }
+
+ break;
+ }
+ x -= length;
+ o += length;
+ }
+
session[s].flags |= SF_LCP_ACKED;
}
else if (*p == ConfigReq)
*q++ = 6;
memset(q, 0, 4); // asyncmap 0
q += 4;
- *((uint16_t *) (response + 2)) = htons(l = q - response); // LCP header length
break;
case 3: // Authentication-Protocol
q = a;
}
- *((uint16_t *) (response + 2)) = htons(l = q - response); // LCP header length
break;
}
break;
memcpy(q, o, length);
q += length;
- *((uint16_t *) (response + 2)) = htons(l = q - response); // LCP header length
}
x -= length;
o += length;
}
- if (!response)
+ if (response)
+ {
+ l = q - response; // LCP packet length
+ *((uint16_t *) (response + 2)) = htons(l); // update header
+ }
+ else
{
- // Send back a ConfigAck
- q = response = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
- if (!q) return;
- *q = ConfigAck;
+ // Send packet back as ConfigAck
+ response = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
+ if (!response) return;
+ *response = ConfigAck;
}
LOG(3, s, t, "Sending %s\n", ppp_lcp_type(*response));