mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-02-20 15:40:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed PPPoS multithread support

Browse Source
This commit is contained in:
Sylvain Rochet 2012-06-23 13:07:43 +02:00
parent dc092653f4
commit a83fb30836
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/netif/ppp/ppp.c
View File

@ -845,7 +845,7 @@ ppp_input_thread(void *arg)
{ {
int count; int count;
ppp_pcb_rx *pcrx = arg; ppp_pcb_rx *pcrx = arg;
ppp_pcb *pcb = (ppp_pcb*)pcrx->pcb; ppp_pcb *pcb = pcrx->pcb;
while (pcb->phase != PHASE_DEAD) { while (pcb->phase != PHASE_DEAD) {
count = sio_read(pcrx->fd, pcrx->rxbuf, PPPOS_RX_BUFSIZE); count = sio_read(pcrx->fd, pcrx->rxbuf, PPPOS_RX_BUFSIZE);
@ -1363,6 +1363,12 @@ pppos_input(ppp_pcb *pcb, u_char* data, int len)
} }
#endif #endif
#if PPP_INPROC_MULTITHREADED
struct ppp_tcpip_callback_header {
ppp_pcb *pcb;
};
#endif /* PPP_INPROC_MULTITHREADED */
/** /**
* Process a received octet string. * Process a received octet string.
*/ */
@ -1416,6 +1422,7 @@ pppos_input_proc(ppp_pcb_rx *pcrx, u_char *s, int l)
struct pbuf *inp; struct pbuf *inp;
#if PPP_INPROC_MULTITHREADED #if PPP_INPROC_MULTITHREADED
struct pbuf *head; struct pbuf *head;
struct ppp_tcpip_callback_header *cbhead;
#endif /* PPP_INPROC_MULTITHREADED */ #endif /* PPP_INPROC_MULTITHREADED */
/* Trim off the checksum. */ /* Trim off the checksum. */
if(pcrx->in_tail->len > 2) { if(pcrx->in_tail->len > 2) {
@ -1440,9 +1447,10 @@ pppos_input_proc(ppp_pcb_rx *pcrx, u_char *s, int l)
pcrx->in_head = NULL; pcrx->in_head = NULL;
pcrx->in_tail = NULL; pcrx->in_tail = NULL;
#if PPP_INPROC_MULTITHREADED #if PPP_INPROC_MULTITHREADED
head = pbuf_alloc(PBUF_RAW, sizeof(void*), PBUF_POOL); head = pbuf_alloc(PBUF_RAW, sizeof(struct ppp_tcpip_callback_header), PBUF_POOL);
if(NULL != head) { if(NULL != head) {
MEMCPY(head->payload, pcb, sizeof(void*)); cbhead = (struct ppp_tcpip_callback_header*)head->payload;
cbhead->pcb = pcb;
pbuf_chain(head, inp); pbuf_chain(head, inp);
if(tcpip_callback_with_block(pppos_input_callback, head, 0) != ERR_OK) { if(tcpip_callback_with_block(pppos_input_callback, head, 0) != ERR_OK) {
PPPDEBUG(LOG_ERR, ("pppos_input_proc[%d]: tcpip_callback() failed, dropping packet\n", pcb->num)); PPPDEBUG(LOG_ERR, ("pppos_input_proc[%d]: tcpip_callback() failed, dropping packet\n", pcb->num));
@ -1584,10 +1592,12 @@ pppos_input_proc(ppp_pcb_rx *pcrx, u_char *s, int l)
*/ */
static void pppos_input_callback(void *arg) { static void pppos_input_callback(void *arg) {
struct pbuf *hd, *pl; struct pbuf *hd, *pl;
struct ppp_tcpip_callback_header *cbhead;
ppp_pcb *pcb; ppp_pcb *pcb;
hd = (struct pbuf *)arg; hd = (struct pbuf *)arg;
pcb = (ppp_pcb *)hd->payload; cbhead = (struct ppp_tcpip_callback_header *)hd->payload;
pcb = cbhead->pcb;
pl = hd->next; pl = hd->next;
pbuf_free(hd); pbuf_free(hd);

2
src/netif/ppp/ppp.h
View File

@ -466,7 +466,7 @@ int ppp_ioctl(ppp_pcb *pcb, int cmd, void *arg);
#if PPPOS_SUPPORT && !PPP_INPROC_OWNTHREAD #if PPPOS_SUPPORT && !PPP_INPROC_OWNTHREAD
/* /*
* PPP over Serial: this is the input function to be called for received data. * PPP over Serial: this is the input function to be called for received data.
* If PPP_INPROC_OWNTHREAD==1, a seperate input thread using the blocking * If PPP_INPROC_OWNTHREAD==1, a separate input thread using the blocking
* sio_read() is used, so this is deactivated. * sio_read() is used, so this is deactivated.
*/ */
void pppos_input(ppp_pcb *pcb, u_char* data, int len); void pppos_input(ppp_pcb *pcb, u_char* data, int len);