Diff: lwip/netif/ppp/ppp.c

Revision:

4:fd826cad83c0

Parent:

0:632c9925f013

Child:

5:dd63a1e02b1b

--- a/lwip/netif/ppp/ppp.c	Fri Jun 18 10:38:57 2010 +0000
+++ b/lwip/netif/ppp/ppp.c	Fri Jul 09 14:46:47 2010 +0000
@@ -249,7 +249,7 @@
 /******************************/
 u_long subnetMask;
 
-static PPPControl pppControl[NUM_PPP] MEM_POSITION; /* The PPP interface control blocks. */
+static PPPControl pppControl[NUM_PPP]; /* The PPP interface control blocks. */
 
 /*
  * PPP Data Link Layer "protocol" table.
@@ -279,7 +279,7 @@
  * Buffers for outgoing packets.  This must be accessed only from the appropriate
  * PPP task so that it doesn't need to be protected to avoid collisions.
  */
-u_char outpacket_buf[NUM_PPP][PPP_MRU+PPP_HDRLEN] MEM_POSITION;
+u_char outpacket_buf[NUM_PPP][PPP_MRU+PPP_HDRLEN];
 
 
 /*****************************/
@@ -439,7 +439,7 @@
 
   magicInit();
 
-  subnetMask = htonl(0xffffff00);
+  subnetMask = PP_HTONL(0xffffff00);
 
   for (i = 0; i < NUM_PPP; i++) {
     /* Initialize each protocol to the standard option set. */
@@ -447,10 +447,6 @@
       (*protp->init)(i);
     }
   }
-
-#if PPPOE_SUPPORT
-  pppoe_init();
-#endif /* PPPOE_SUPPORT */
 }
 
 void
@@ -706,12 +702,12 @@
 nPut(PPPControl *pc, struct pbuf *nb)
 {
   struct pbuf *b;
-  int c = 0;
+  int c;
 
   for(b = nb; b != NULL; b = b->next) {
     if((c = sio_write(pc->fd, (u8_t*)b->payload, b->len)) != b->len) {
       PPPDEBUG(LOG_WARNING,
-               ("PPP nPut: incomplete sio_write(fd:%d, len:%d, c: 0x%"X8_F") c = %d\n", (size_t)pc->fd, b->len, c, c));
+               ("PPP nPut: incomplete sio_write(fd:%"SZT_F", len:%d, c: 0x%"X8_F") c = %d\n", (size_t)pc->fd, b->len, c, c));
       LINK_STATS_INC(link.err);
       pc->lastXMit = 0; /* prepend PPP_FLAG to next packet */
       snmp_inc_ifoutdiscards(&pc->netif);
@@ -766,7 +762,7 @@
 
 #if PPPOE_SUPPORT
 static err_t
-pppnetifOutputOverEthernet(int pd, struct pbuf *p)
+pppifOutputOverEthernet(int pd, struct pbuf *p)
 {
   PPPControl *pc = &pppControl[pd];
   struct pbuf *pb;
@@ -810,7 +806,7 @@
 
 /* Send a packet on the given connection. */
 static err_t
-pppnetifOutput(struct netif *netif, struct pbuf *pb, ip_addr_t *ipaddr)
+pppifOutput(struct netif *netif, struct pbuf *pb, ip_addr_t *ipaddr)
 {
   int pd = (int)(size_t)netif->state;
   PPPControl *pc = &pppControl[pd];
@@ -827,7 +823,7 @@
   /* We let any protocol value go through - it can't hurt us
    * and the peer will just drop it if it's not accepting it. */
   if (pd < 0 || pd >= NUM_PPP || !pc->openFlag || !pb) {
-    PPPDEBUG(LOG_WARNING, ("pppnetifOutput[%d]: bad parms prot=%d pb=%p\n",
+    PPPDEBUG(LOG_WARNING, ("pppifOutput[%d]: bad parms prot=%d pb=%p\n",
               pd, PPP_IP, pb));
     LINK_STATS_INC(link.opterr);
     LINK_STATS_INC(link.drop);
@@ -837,7 +833,7 @@
 
   /* Check that the link is up. */
   if (lcp_phase[pd] == PHASE_DEAD) {
-    PPPDEBUG(LOG_ERR, ("pppnetifOutput[%d]: link not up\n", pd));
+    PPPDEBUG(LOG_ERR, ("pppifOutput[%d]: link not up\n", pd));
     LINK_STATS_INC(link.rterr);
     LINK_STATS_INC(link.drop);
     snmp_inc_ifoutdiscards(netif);
@@ -846,7 +842,7 @@
 
 #if PPPOE_SUPPORT
   if(pc->ethif) {
-    return pppnetifOutputOverEthernet(pd, pb);
+    return pppifOutputOverEthernet(pd, pb);
   }
 #endif /* PPPOE_SUPPORT */
 
@@ -854,7 +850,7 @@
   /* Grab an output buffer. */
   headMB = pbuf_alloc(PBUF_RAW, 0, PBUF_POOL);
   if (headMB == NULL) {
-    PPPDEBUG(LOG_WARNING, ("pppnetifOutput[%d]: first alloc fail\n", pd));
+    PPPDEBUG(LOG_WARNING, ("pppifOutput[%d]: first alloc fail\n", pd));
     LINK_STATS_INC(link.memerr);
     LINK_STATS_INC(link.drop);
     snmp_inc_ifoutdiscards(netif);
@@ -879,7 +875,7 @@
         protocol = PPP_VJC_UNCOMP;
         break;
       default:
-        PPPDEBUG(LOG_WARNING, ("pppnetifOutput[%d]: bad IP packet\n", pd));
+        PPPDEBUG(LOG_WARNING, ("pppifOutput[%d]: bad IP packet\n", pd));
         LINK_STATS_INC(link.proterr);
         LINK_STATS_INC(link.drop);
         snmp_inc_ifoutdiscards(netif);
@@ -940,7 +936,7 @@
   /* If we failed to complete the packet, throw it away. */
   if (!tailMB) {
     PPPDEBUG(LOG_WARNING,
-             ("pppnetifOutput[%d]: Alloc err - dropping proto=%d\n", 
+             ("pppifOutput[%d]: Alloc err - dropping proto=%d\n", 
               pd, protocol));
     pbuf_free(headMB);
     LINK_STATS_INC(link.memerr);
@@ -950,7 +946,7 @@
   }
 
   /* Send it. */
-  PPPDEBUG(LOG_INFO, ("pppnetifOutput[%d]: proto=0x%"X16_F"\n", pd, protocol));
+  PPPDEBUG(LOG_INFO, ("pppifOutput[%d]: proto=0x%"X16_F"\n", pd, protocol));
 
   nPut(pc, headMB);
 #endif /* PPPOS_SUPPORT */
@@ -1320,14 +1316,14 @@
 }
 
 /*
- * pppnetifNetifInit - netif init callback
+ * pppifNetifInit - netif init callback
  */
 static err_t
-pppnetifNetifInit(struct netif *netif)
+pppifNetifInit(struct netif *netif)
 {
   netif->name[0] = 'p';
   netif->name[1] = 'p';
-  netif->output = pppnetifOutput;
+  netif->output = pppifOutput;
   netif->mtu = pppMTU((int)(size_t)netif->state);
   netif->flags = NETIF_FLAG_POINTTOPOINT | NETIF_FLAG_LINK_UP;
 #if LWIP_NETIF_HOSTNAME
@@ -1353,7 +1349,7 @@
   } else {
     netif_remove(&pc->netif);
     if (netif_add(&pc->netif, &pc->addrs.our_ipaddr, &pc->addrs.netmask,
-                  &pc->addrs.his_ipaddr, (void *)(size_t)pd, pppnetifNetifInit, ip_input)) {
+                  &pc->addrs.his_ipaddr, (void *)(size_t)pd, pppifNetifInit, ip_input)) {
       netif_set_up(&pc->netif);
       pc->if_up = 1;
       pc->errCode = PPPERR_NONE;
@@ -1583,7 +1579,7 @@
     return p; /* live dangerously */
   }
 
-  for(b = p, pl = (u_char*) q->payload; b != NULL; b = b->next) {
+  for(b = p, pl = (u_char*)q->payload; b != NULL; b = b->next) {
     MEMCPY(pl, b->payload, b->len);
     pl += b->len;
   }
@@ -1669,8 +1665,8 @@
       PPPDEBUG(LOG_WARNING, ("pppInput[%d]: Dropping VJ uncompressed\n", pd));
 #else  /* PPPOS_SUPPORT && VJ_SUPPORT */
       /* No handler for this protocol so drop the packet. */
-      PPPDEBUG((LOG_INFO,
-               "pppInput[%d]: drop VJ UnComp in %d:.*H\n", 
+      PPPDEBUG(LOG_INFO,
+               ("pppInput[%d]: drop VJ UnComp in %d:.*H\n", 
                 pd, nb->len, LWIP_MIN(nb->len * 2, 40), nb->payload));
 #endif /* PPPOS_SUPPORT && VJ_SUPPORT */
       break;
@@ -1710,7 +1706,7 @@
       protocol = htons(protocol);
       SMEMCPY(nb->payload, &protocol, sizeof(protocol));
 #endif /* BYTE_ORDER == LITTLE_ENDIAN */
-      lcp_sprotrej(pd, (u_char*) nb->payload, nb->len);
+      lcp_sprotrej(pd, (u_char*)nb->payload, nb->len);
     }
     break;
   }
@@ -1893,9 +1889,9 @@
           }
 #if 0
           else {
-            PPPDEBUG((LOG_WARNING,
-                     "pppInProc[%d]: Invalid control <%d>\n", pcrx->pd, curChar));
-                      pcrx->inState = PDSTART;
+            PPPDEBUG(LOG_WARNING,
+                     ("pppInProc[%d]: Invalid control <%d>\n", pcrx->pd, curChar));
+            pcrx->inState = PDSTART;
           }
 #endif
         case PDPROTOCOL1:               /* Process protocol field 1. */
@@ -1935,7 +1931,7 @@
               break;
             }
             if (pcrx->inHead == NULL) {
-              struct pppInputHeader *pih = (struct pppInputHeader*) nextNBuf->payload;
+              struct pppInputHeader *pih = (struct pppInputHeader *)nextNBuf->payload;
 
               pih->unit = pcrx->pd;
               pih->proto = pcrx->inProtocol;