Now I got the source tree. But I want to keep PPPE_SERVER patch for
some time (mostly because I study pppoe and spppsubr now).
May I start with some really cosmetic changes like this?

That 'default' goes immediately after 'switch', before all 'case'...

cvs server: Diffing .
Index: if_spppsubr.c
===================================================================
RCS file: /cvs/src/sys/net/if_spppsubr.c,v
retrieving revision 1.2
diff -u -r1.2 if_spppsubr.c
--- if_spppsubr.c       26 Dec 2008 18:51:52 -0000      1.2
+++ if_spppsubr.c       27 May 2009 15:33:52 -0000
@@ -474,7 +474,7 @@
 };


-/*
+/*
  * Exported functions, comprising our interface to the lower layer.
  */

@@ -559,18 +559,6 @@
                        goto drop;
                }
                switch (ntohs (h->protocol)) {
-               default:
-                       if (sp->state[IDX_LCP] == STATE_OPENED)
-                               sppp_cp_send (sp, PPP_LCP, PROTO_REJ,
-                                   ++sp->pp_seq, 2, &h->protocol);
-                       if (debug)
-                               log(LOG_DEBUG,
-                                   SPP_FMT "invalid input protocol "
-                                   "<addr=0x%x ctrl=0x%x proto=0x%x>\n",
-                                   SPP_ARGS(ifp),
-                                   h->address, h->control, ntohs(h->protocol));
-                       ++ifp->if_noproto;
-                       goto drop;
                case PPP_LCP:
                        sppp_cp_input(&lcp, sp, m);
                        m_freem (m);
@@ -613,6 +601,18 @@
                        }
                        break;
 #endif
+               default:
+                       if (sp->state[IDX_LCP] == STATE_OPENED)
+                               sppp_cp_send (sp, PPP_LCP, PROTO_REJ,
+                                   ++sp->pp_seq, 2, &h->protocol);
+                       if (debug)
+                               log(LOG_DEBUG,
+                                   SPP_FMT "invalid input protocol "
+                                   "<addr=0x%x ctrl=0x%x proto=0x%x>\n",
+                                   SPP_ARGS(ifp),
+                                   h->address, h->control, ntohs(h->protocol));
+                       ++ifp->if_noproto;
+                       goto drop;
                }
                break;
        case CISCO_MULTICAST:
@@ -1135,7 +1135,7 @@
 }


-/*
+/*
  * Cisco framing implementation.
  */

-- 
antonvm

Reply via email to