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

reinstate sendccp as initccp; send only once

Browse source
This commit is contained in:
Brendan O'Dea 2004-11-25 12:41:35 +00:00
parent 26fb3ab9ac
commit 82248353c8
3 changed files with 46 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Changes
View file

@ -1,5 +1,5 @@
* Thu Nov 25 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.9 * Thu Nov 25 2004 Brendan O'Dea <bod@optusnet.com.au> 2.0.9
- Drop sendccp. If client sends a CCP request for compression just NAK it. - Revise CCP, send ConfigReq once only.
- Don't copy the old buffer into Config{Nak,Rej} LCP responses (oops); - Don't copy the old buffer into Config{Nak,Rej} LCP responses (oops);
add length checks when appending. add length checks when appending.
- Have makeppp print a backtrace on overflow. - Have makeppp print a backtrace on overflow.

3
l2tpns.h
View file

@ -1,5 +1,5 @@
// L2TPNS Global Stuff // L2TPNS Global Stuff
// $Id: l2tpns.h,v 1.36 2004-11-25 02:45:27 bodea Exp $ // $Id: l2tpns.h,v 1.37 2004-11-25 12:41:35 bodea Exp $
#ifndef __L2TPNS_H__ #ifndef __L2TPNS_H__
#define __L2TPNS_H__ #define __L2TPNS_H__
@ -205,6 +205,7 @@ sessiont;
#define SF_IPCP_ACKED 1 // Has this session seen an IPCP Ack? #define SF_IPCP_ACKED 1 // Has this session seen an IPCP Ack?
#define SF_LCP_ACKED 2 // LCP negotiated #define SF_LCP_ACKED 2 // LCP negotiated
#define SF_CCP_ACKED 4 // CCP negotiated
typedef struct { typedef struct {
u32 cin; u32 cin;

53
ppp.c
View file

@ -1,6 +1,6 @@
// L2TPNS PPP Stuff // L2TPNS PPP Stuff
char const *cvs_id_ppp = "$Id: ppp.c,v 1.28 2004-11-25 02:45:27 bodea Exp $"; char const *cvs_id_ppp = "$Id: ppp.c,v 1.29 2004-11-25 12:41:35 bodea Exp $";
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -23,6 +23,8 @@ extern u32 eth_tx;
extern time_t time_now; extern time_t time_now;
extern struct configt *config; extern struct configt *config;
static void initccp(tunnelidt t, sessionidt s);
// Process PAP messages // Process PAP messages
void processpap(tunnelidt t, sessionidt s, u8 *p, u16 l) void processpap(tunnelidt t, sessionidt s, u8 *p, u16 l)
{ {
@ -589,8 +591,8 @@ void processipcp(tunnelidt t, sessionidt s, u8 *p, u16 l)
LOG(3, session[s].ip, s, t, "IPCP Acked, session is now active\n"); LOG(3, session[s].ip, s, t, "IPCP Acked, session is now active\n");
// clear LCP_ACKED flag for possible fast renegotiaion for routers // clear LCP_ACKED/CCP_ACKED flag for possible fast renegotiaion for routers
session[s].flags &= ~SF_LCP_ACKED; session[s].flags &= ~(SF_LCP_ACKED|SF_CCP_ACKED);
return; return;
} }
@ -806,11 +808,23 @@ void processccp(tunnelidt t, sessionidt s, u8 *p, u16 l)
LOG_HEX(5, "CCP", p, l); LOG_HEX(5, "CCP", p, l);
switch (l > 1 ? *p : 0) switch (l > 1 ? *p : 0)
{ {
case ConfigAck:
session[s].flags |= SF_CCP_ACKED;
return;
case ConfigReq: case ConfigReq:
if (l < 6) if (l < 6) // accept no compression
*p = ConfigAck; // accept no compression {
else *p = ConfigAck;
*p = ConfigRej; // reject break;
}
// compression requested--reject
*p = ConfigRej;
// send CCP request for no compression for our end if not negotiated
if (!(session[s].flags & SF_CCP_ACKED))
initccp();
break; break;
@ -924,10 +938,10 @@ u8 *makeppp(u8 *b, int size, u8 *p, int l, tunnelidt t, sessionidt s, u16 mtype)
return b; return b;
} }
// Send initial LCP ConfigReq // Send initial LCP ConfigReq for PAP, set magic no.
void initlcp(tunnelidt t, sessionidt s) void initlcp(tunnelidt t, sessionidt s)
{ {
char b[500] = {0}, *q; char b[500], *q;
if (!(q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPLCP))) if (!(q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPLCP)))
return; return;
@ -942,5 +956,24 @@ void initlcp(tunnelidt t, sessionidt s)
*(u8 *)(q + 10) = 3; *(u8 *)(q + 10) = 3;
*(u8 *)(q + 11) = 4; *(u8 *)(q + 11) = 4;
*(u16 *)(q + 12) = htons(PPPPAP); // PAP *(u16 *)(q + 12) = htons(PPPPAP); // PAP
tunnelsend(b, 12 + 14, t);
LOG_HEX(5, "PPPLCP", q, 14);
tunnelsend(b, (q - b) + 14, t);
}
// Send CCP request for no compression
static void sendccp(tunnelidt t, sessionidt s)
{
char b[500], *q;
if (!(q = makeppp(b, sizeof(b), NULL, 0, t, s, PPPCCP)))
return;
LOG(4, 0, s, t, "Sending CCP ConfigReq for no compression\n");
*q = ConfigReq;
*(u8 *)(q + 1) = (time_now % 255) + 1; // ID
*(u16 *)(q + 2) = htons(4); // Length
LOG_HEX(5, "PPPCCP", q, 4);
tunnelsend(b, (q - b) + 4 , t);
} }