welterde/l2tpns
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: Tunnel creation does not work when the length of the hostname is odd. (revert fix: Add a uint16_t control buffer type, as a union)

Browse source
This commit is contained in:
fendo 2013-02-26 00:25:45 +01:00
parent ec1507a6c2
commit 9e78f1af54
2 changed files with 40 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

79
l2tpns.c
View file

@ -1819,10 +1819,10 @@ static void send_ipout(sessionidt s, uint8_t *buf, int len)
static void control16(controlt * c, uint16_t avp, uint16_t val, uint8_t m)
{
uint16_t l = (m ? 0x8008 : 0x0008);
c->buf16[c->length/2 + 0] = htons(l);
c->buf16[c->length/2 + 1] = htons(0);
c->buf16[c->length/2 + 2] = htons(avp);
c->buf16[c->length/2 + 3] = htons(val);
*(uint16_t *) (c->buf + c->length + 0) = htons(l);
*(uint16_t *) (c->buf + c->length + 2) = htons(0);
*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
*(uint16_t *) (c->buf + c->length + 6) = htons(val);
c->length += 8;
}
@ -1830,10 +1830,10 @@ static void control16(controlt * c, uint16_t avp, uint16_t val, uint8_t m)
static void control32(controlt * c, uint16_t avp, uint32_t val, uint8_t m)
{
uint16_t l = (m ? 0x800A : 0x000A);
c->buf16[c->length/2 + 0] = htons(l);
c->buf16[c->length/2 + 1] = htons(0);
c->buf16[c->length/2 + 2] = htons(avp);
*(uint32_t *) &c->buf[c->length + 6] = htonl(val);
*(uint16_t *) (c->buf + c->length + 0) = htons(l);
*(uint16_t *) (c->buf + c->length + 2) = htons(0);
*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
*(uint32_t *) (c->buf + c->length + 6) = htonl(val);
c->length += 10;
}
@ -1841,10 +1841,10 @@ static void control32(controlt * c, uint16_t avp, uint32_t val, uint8_t m)
static void controls(controlt * c, uint16_t avp, char *val, uint8_t m)
{
uint16_t l = ((m ? 0x8000 : 0) + strlen(val) + 6);
c->buf16[c->length/2 + 0] = htons(l);
c->buf16[c->length/2 + 1] = htons(0);
c->buf16[c->length/2 + 2] = htons(avp);
memcpy(&c->buf[c->length + 6], val, strlen(val));
*(uint16_t *) (c->buf + c->length + 0) = htons(l);
*(uint16_t *) (c->buf + c->length + 2) = htons(0);
*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
memcpy(c->buf + c->length + 6, val, strlen(val));
c->length += 6 + strlen(val);
}
@ -1852,10 +1852,10 @@ static void controls(controlt * c, uint16_t avp, char *val, uint8_t m)
static void controlb(controlt * c, uint16_t avp, uint8_t *val, unsigned int len, uint8_t m)
{
uint16_t l = ((m ? 0x8000 : 0) + len + 6);
c->buf16[c->length/2 + 0] = htons(l);
c->buf16[c->length/2 + 1] = htons(0);
c->buf16[c->length/2 + 2] = htons(avp);
memcpy(&c->buf[c->length + 6], val, len);
*(uint16_t *) (c->buf + c->length + 0) = htons(l);
*(uint16_t *) (c->buf + c->length + 2) = htons(0);
*(uint16_t *) (c->buf + c->length + 4) = htons(avp);
memcpy(c->buf + c->length + 6, val, len);
c->length += 6 + len;
}
@ -1872,7 +1872,7 @@ static controlt *controlnew(uint16_t mtype)
}
assert(c);
c->next = 0;
c->buf16[0] = htons(0xC802); // flags/ver
*(uint16_t *) (c->buf + 0) = htons(0xC802); // flags/ver
c->length = 12;
control16(c, 0, mtype, 1);
return c;
@ -1882,26 +1882,26 @@ static controlt *controlnew(uint16_t mtype)
// (ZLB send).
static void controlnull(tunnelidt t)
{
uint16_t buf[6];
uint8_t buf[12];
if (tunnel[t].controlc) // Messages queued; They will carry the ack.
return;
buf[0] = htons(0xC802); // flags/ver
buf[1] = htons(12); // length
buf[2] = htons(tunnel[t].far); // tunnel
buf[3] = htons(0); // session
buf[4] = htons(tunnel[t].ns); // sequence
buf[5] = htons(tunnel[t].nr); // sequence
tunnelsend((uint8_t *)buf, 12, t);
*(uint16_t *) (buf + 0) = htons(0xC802); // flags/ver
*(uint16_t *) (buf + 2) = htons(12); // length
*(uint16_t *) (buf + 4) = htons(tunnel[t].far); // tunnel
*(uint16_t *) (buf + 6) = htons(0); // session
*(uint16_t *) (buf + 8) = htons(tunnel[t].ns); // sequence
*(uint16_t *) (buf + 10) = htons(tunnel[t].nr); // sequence
tunnelsend(buf, 12, t);
}
// add a control message to a tunnel, and send if within window
static void controladd(controlt *c, sessionidt far, tunnelidt t)
{
c->buf16[1] = htons(c->length); // length
c->buf16[2] = htons(tunnel[t].far); // tunnel
c->buf16[3] = htons(far); // session
c->buf16[4] = htons(tunnel[t].ns); // sequence
*(uint16_t *) (c->buf + 2) = htons(c->length); // length
*(uint16_t *) (c->buf + 4) = htons(tunnel[t].far); // tunnel
*(uint16_t *) (c->buf + 6) = htons(far); // session
*(uint16_t *) (c->buf + 8) = htons(tunnel[t].ns); // sequence
tunnel[t].ns++; // advance sequence
// link in message in to queue
if (tunnel[t].controlc)
@ -2152,15 +2152,14 @@ void sessionshutdown(sessionidt s, char const *reason, int cdn_result, int cdn_e
pppoe_shutdown_session(s);
}
else
{
// Send CDN
{ // Send CDN
controlt *c = controlnew(14); // sending CDN
if (cdn_error)
{
uint16_t buf[2];
buf[0] = htons(cdn_result);
buf[1] = htons(cdn_error);
controlb(c, 1, (uint8_t *)buf, 4, 1);
uint8_t buf[4];
*(uint16_t *) buf = htons(cdn_result);
*(uint16_t *) (buf+2) = htons(cdn_error);
controlb(c, 1, buf, 4, 1);
}
else
control16(c, 1, cdn_result, 1);
@ -2362,21 +2361,21 @@ static void tunnelshutdown(tunnelidt t, char *reason, int result, int error, cha
controlt *c = controlnew(4); // sending StopCCN
if (error)
{
uint16_t buf[32];
uint8_t buf[64];
int l = 4;
buf[0] = htons(result);
buf[1] = htons(error);
*(uint16_t *) buf = htons(result);
*(uint16_t *) (buf+2) = htons(error);
if (msg)
{
int m = strlen(msg);
if (m + 4 > sizeof(buf))
m = sizeof(buf) - 4;
memcpy(buf+2, msg, m);
memcpy(buf+4, msg, m);
l += m;
}
controlb(c, 1, (uint8_t *)buf, l, 1);
controlb(c, 1, buf, l, 1);
}
else
control16(c, 1, result, 1);

3
l2tpns.h
View file

@ -247,10 +247,7 @@ typedef struct controls // control message
{
struct controls *next; // next in queue
uint16_t length; // length
union {
uint8_t buf[MAXCONTROL];
uint16_t buf16[MAXCONTROL/2];
} __attribute__ ((__transparent_union__));
}
controlt;