X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/f9bd39e509bc60a791714ad784e7a435460b509c..2d7d819bfa791775cc8706ff952c931bd054d32e:/l2tpns.c diff --git a/l2tpns.c b/l2tpns.c index c9013b2..54b2aff 100644 --- a/l2tpns.c +++ b/l2tpns.c @@ -4,7 +4,7 @@ // Copyright (c) 2002 FireBrick (Andrews & Arnold Ltd / Watchfront Ltd) - GPL licenced // vim: sw=8 ts=8 -char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.136 2005/09/16 05:54:53 bodea Exp $"; +char const *cvs_id_l2tpns = "$Id: l2tpns.c,v 1.139 2005/09/16 11:46:48 bodea Exp $"; #include #include @@ -1023,13 +1023,13 @@ void adjust_tcp_mss(sessionidt s, tunnelidt t, uint8_t *buf, int len, uint8_t *t if (orig <= MSS) return; // mss OK - LOG(5, s, t, "TCP: %s:%u -> %s:%u SYN%s, adjusted mss from %u to %u\n", + LOG(5, s, t, "TCP: %s:%u -> %s:%u SYN%s: adjusted mss from %u to %u\n", fmtaddr(*(in_addr_t *) (buf + 12), 0), ntohs(*(uint16_t *) tcp), fmtaddr(*(in_addr_t *) (buf + 16), 1), ntohs(*(uint16_t *) (tcp + 2)), (tcp[13] & TCP_FLAG_ACK) ? ",ACK" : "", orig, MSS); // set mss - *(int16_t *) mss = MSS; + *(int16_t *) mss = htons(MSS); // adjust checksum (see rfc1141) sum = orig + (~MSS & 0xffff); @@ -2608,10 +2608,10 @@ void processudp(uint8_t *buf, int len, struct sockaddr_in *addr) l += 6; if (l > mru) l = mru; - q = makeppp(buf, sizeof(buf), 0, 0, s, t, proto); + q = makeppp(buf, sizeof(buf), 0, 0, s, t, PPPLCP); if (!q) return; - *q = CodeRej; + *q = ProtocolRej; *(q + 1) = ++sess_local[s].lcp_ident; *(uint16_t *)(q + 2) = l; *(uint16_t *)(q + 4) = htons(proto);