mirror of
https://git.savannah.nongnu.org/git/lwip.git
synced 2025-08-09 07:54:38 +08:00
Minor changes: fix some problems with PPPoE include path, add small comments in slip.c (unusual octal values?)
This commit is contained in:
parent
2942157ca4
commit
e5a98b6a5b
@ -55,6 +55,11 @@
|
|||||||
#include "lwip/dhcp.h"
|
#include "lwip/dhcp.h"
|
||||||
#include "lwip/autoip.h"
|
#include "lwip/autoip.h"
|
||||||
#include "netif/etharp.h"
|
#include "netif/etharp.h"
|
||||||
|
|
||||||
|
#if PPPOE_SUPPORT
|
||||||
|
#include "netif/ppp_oe.h"
|
||||||
|
#endif /* PPPOE_SUPPORT */
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
/** the time an ARP entry stays valid after its last update,
|
/** the time an ARP entry stays valid after its last update,
|
||||||
|
@ -67,7 +67,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#if PPPOE_SUPPORT
|
#if PPPOE_SUPPORT
|
||||||
#include "ppp_oe.h"
|
#include "netif/ppp_oe.h"
|
||||||
#else
|
#else
|
||||||
#define PPPOE_MAXMTU PPP_MAXMRU
|
#define PPPOE_MAXMTU PPP_MAXMRU
|
||||||
#endif
|
#endif
|
||||||
|
@ -102,7 +102,7 @@
|
|||||||
#include "vj.h"
|
#include "vj.h"
|
||||||
#endif /* VJ_SUPPORT */
|
#endif /* VJ_SUPPORT */
|
||||||
#if PPPOE_SUPPORT
|
#if PPPOE_SUPPORT
|
||||||
#include "ppp_oe.h"
|
#include "netif/ppp_oe.h"
|
||||||
#endif /* PPPOE_SUPPORT */
|
#endif /* PPPOE_SUPPORT */
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -73,12 +73,13 @@
|
|||||||
#if PPPOE_SUPPORT /* don't build if not configured for use in lwipopts.h */
|
#if PPPOE_SUPPORT /* don't build if not configured for use in lwipopts.h */
|
||||||
|
|
||||||
#include "ppp.h"
|
#include "ppp.h"
|
||||||
#include "ppp_oe.h"
|
|
||||||
#include "pppdebug.h"
|
#include "pppdebug.h"
|
||||||
|
|
||||||
#include "netif/etharp.h"
|
|
||||||
#include "lwip/sys.h"
|
#include "lwip/sys.h"
|
||||||
|
|
||||||
|
#include "netif/ppp_oe.h"
|
||||||
|
#include "netif/etharp.h"
|
||||||
|
|
||||||
#include "queue.h"
|
#include "queue.h"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
@ -51,10 +51,10 @@
|
|||||||
#include "lwip/snmp.h"
|
#include "lwip/snmp.h"
|
||||||
#include "lwip/sio.h"
|
#include "lwip/sio.h"
|
||||||
|
|
||||||
#define SLIP_END 0300
|
#define SLIP_END 0300 /* 0xC0 */
|
||||||
#define SLIP_ESC 0333
|
#define SLIP_ESC 0333 /* 0xDB */
|
||||||
#define SLIP_ESC_END 0334
|
#define SLIP_ESC_END 0334 /* 0xDC */
|
||||||
#define SLIP_ESC_ESC 0335
|
#define SLIP_ESC_ESC 0335 /* 0xDD */
|
||||||
|
|
||||||
#define MAX_SIZE 1500
|
#define MAX_SIZE 1500
|
||||||
|
|
||||||
@ -180,6 +180,7 @@ slipif_input(struct netif *netif)
|
|||||||
q = p;
|
q = p;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* this automatically drops bytes if > MAX_SIZE */
|
/* this automatically drops bytes if > MAX_SIZE */
|
||||||
if ((p != NULL) && (recved <= MAX_SIZE)) {
|
if ((p != NULL) && (recved <= MAX_SIZE)) {
|
||||||
((u8_t *)p->payload)[i] = c;
|
((u8_t *)p->payload)[i] = c;
|
||||||
@ -192,7 +193,7 @@ slipif_input(struct netif *netif)
|
|||||||
/* p is a chain, on to the next in the chain */
|
/* p is a chain, on to the next in the chain */
|
||||||
p = p->next;
|
p = p->next;
|
||||||
} else {
|
} else {
|
||||||
/* p is a signle pbuf, set it to NULL so next time a new
|
/* p is a single pbuf, set it to NULL so next time a new
|
||||||
* pbuf is allocated */
|
* pbuf is allocated */
|
||||||
p = NULL;
|
p = NULL;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user