You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2017/12/07 08:53:49 UTC
[GitHub] utzig closed pull request #694: Remove PPPoverEthernet due to incompatible license.
utzig closed pull request #694: Remove PPPoverEthernet due to incompatible license.
URL: https://github.com/apache/mynewt-core/pull/694
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/net/ip/lwip_base/include/netif/ppp/pppoe.h b/net/ip/lwip_base/include/netif/ppp/pppoe.h
deleted file mode 100644
index 9f8f2892b..000000000
--- a/net/ip/lwip_base/include/netif/ppp/pppoe.h
+++ /dev/null
@@ -1,179 +0,0 @@
-/*****************************************************************************
-* pppoe.h - PPP Over Ethernet implementation for lwIP.
-*
-* Copyright (c) 2006 by Marc Boucher, Services Informatiques (MBSI) inc.
-*
-* The authors hereby grant permission to use, copy, modify, distribute,
-* and license this software and its documentation for any purpose, provided
-* that existing copyright notices are retained in all copies and that this
-* notice and the following disclaimer are included verbatim in any
-* distributions. No written agreement, license, or royalty fee is required
-* for any of the authorized uses.
-*
-* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
-* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-******************************************************************************
-* REVISION HISTORY
-*
-* 06-01-01 Marc Boucher <ma...@mbsi.ca>
-* Ported to lwIP.
-*****************************************************************************/
-
-
-
-/* based on NetBSD: if_pppoe.c,v 1.64 2006/01/31 23:50:15 martin Exp */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <ma...@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && PPPOE_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#ifndef PPP_OE_H
-#define PPP_OE_H
-
-#include "ppp.h"
-#include "lwip/etharp.h"
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-# include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct pppoehdr {
- PACK_STRUCT_FLD_8(u8_t vertype);
- PACK_STRUCT_FLD_8(u8_t code);
- PACK_STRUCT_FIELD(u16_t session);
- PACK_STRUCT_FIELD(u16_t plen);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-# include "arch/epstruct.h"
-#endif
-
-#ifdef PACK_STRUCT_USE_INCLUDES
-# include "arch/bpstruct.h"
-#endif
-PACK_STRUCT_BEGIN
-struct pppoetag {
- PACK_STRUCT_FIELD(u16_t tag);
- PACK_STRUCT_FIELD(u16_t len);
-} PACK_STRUCT_STRUCT;
-PACK_STRUCT_END
-#ifdef PACK_STRUCT_USE_INCLUDES
-# include "arch/epstruct.h"
-#endif
-
-
-#define PPPOE_STATE_INITIAL 0
-#define PPPOE_STATE_PADI_SENT 1
-#define PPPOE_STATE_PADR_SENT 2
-#define PPPOE_STATE_SESSION 3
-/* passive */
-#define PPPOE_STATE_PADO_SENT 1
-
-#define PPPOE_HEADERLEN sizeof(struct pppoehdr)
-#define PPPOE_VERTYPE 0x11 /* VER=1, TYPE = 1 */
-
-#define PPPOE_TAG_EOL 0x0000 /* end of list */
-#define PPPOE_TAG_SNAME 0x0101 /* service name */
-#define PPPOE_TAG_ACNAME 0x0102 /* access concentrator name */
-#define PPPOE_TAG_HUNIQUE 0x0103 /* host unique */
-#define PPPOE_TAG_ACCOOKIE 0x0104 /* AC cookie */
-#define PPPOE_TAG_VENDOR 0x0105 /* vendor specific */
-#define PPPOE_TAG_RELAYSID 0x0110 /* relay session id */
-#define PPPOE_TAG_SNAME_ERR 0x0201 /* service name error */
-#define PPPOE_TAG_ACSYS_ERR 0x0202 /* AC system error */
-#define PPPOE_TAG_GENERIC_ERR 0x0203 /* gerneric error */
-
-#define PPPOE_CODE_PADI 0x09 /* Active Discovery Initiation */
-#define PPPOE_CODE_PADO 0x07 /* Active Discovery Offer */
-#define PPPOE_CODE_PADR 0x19 /* Active Discovery Request */
-#define PPPOE_CODE_PADS 0x65 /* Active Discovery Session confirmation */
-#define PPPOE_CODE_PADT 0xA7 /* Active Discovery Terminate */
-
-#ifndef PPPOE_MAX_AC_COOKIE_LEN
-#define PPPOE_MAX_AC_COOKIE_LEN 64
-#endif
-
-struct pppoe_softc {
- struct pppoe_softc *next;
- struct netif *sc_ethif; /* ethernet interface we are using */
- ppp_pcb *pcb; /* PPP PCB */
-
- struct eth_addr sc_dest; /* hardware address of concentrator */
- u16_t sc_session; /* PPPoE session id */
- u8_t sc_state; /* discovery phase or session connected */
-
-#ifdef PPPOE_TODO
- u8_t *sc_service_name; /* if != NULL: requested name of service */
- u8_t *sc_concentrator_name; /* if != NULL: requested concentrator id */
-#endif /* PPPOE_TODO */
- u8_t sc_ac_cookie[PPPOE_MAX_AC_COOKIE_LEN]; /* content of AC cookie we must echo back */
- u8_t sc_ac_cookie_len; /* length of cookie data */
-#ifdef PPPOE_SERVER
- u8_t *sc_hunique; /* content of host unique we must echo back */
- u8_t sc_hunique_len; /* length of host unique */
-#endif
- u8_t sc_padi_retried; /* number of PADI retries already done */
- u8_t sc_padr_retried; /* number of PADR retries already done */
-};
-
-
-#define pppoe_init() /* compatibility define, no initialization needed */
-
-ppp_pcb *pppoe_create(struct netif *pppif,
- struct netif *ethif,
- const char *service_name, const char *concentrator_name,
- ppp_link_status_cb_fn link_status_cb, void *ctx_cb);
-
-/*
- * Functions called from lwIP
- * DO NOT CALL FROM lwIP USER APPLICATION.
- */
-void pppoe_disc_input(struct netif *netif, struct pbuf *p);
-void pppoe_data_input(struct netif *netif, struct pbuf *p);
-
-#endif /* PPP_OE_H */
-
-#endif /* PPP_SUPPORT && PPPOE_SUPPORT */
diff --git a/net/ip/lwip_base/src/netif/ppp/pppoe.c b/net/ip/lwip_base/src/netif/ppp/pppoe.c
deleted file mode 100644
index eabfa4d04..000000000
--- a/net/ip/lwip_base/src/netif/ppp/pppoe.c
+++ /dev/null
@@ -1,1191 +0,0 @@
-/*****************************************************************************
-* pppoe.c - PPP Over Ethernet implementation for lwIP.
-*
-* Copyright (c) 2006 by Marc Boucher, Services Informatiques (MBSI) inc.
-*
-* The authors hereby grant permission to use, copy, modify, distribute,
-* and license this software and its documentation for any purpose, provided
-* that existing copyright notices are retained in all copies and that this
-* notice and the following disclaimer are included verbatim in any
-* distributions. No written agreement, license, or royalty fee is required
-* for any of the authorized uses.
-*
-* THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS *AS IS* AND ANY EXPRESS OR
-* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-* IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-******************************************************************************
-* REVISION HISTORY
-*
-* 06-01-01 Marc Boucher <ma...@mbsi.ca>
-* Ported to lwIP.
-*****************************************************************************/
-
-
-
-/* based on NetBSD: if_pppoe.c,v 1.64 2006/01/31 23:50:15 martin Exp */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Martin Husemann <ma...@NetBSD.org>.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "netif/ppp/ppp_opts.h"
-#if PPP_SUPPORT && PPPOE_SUPPORT /* don't build if not configured for use in lwipopts.h */
-
-#if 0 /* UNUSED */
-#include <string.h>
-#include <stdio.h>
-#endif /* UNUSED */
-
-#include "lwip/timeouts.h"
-#include "lwip/memp.h"
-#include "lwip/stats.h"
-#include "lwip/snmp.h"
-
-#include "netif/ethernet.h"
-#include "netif/ppp/ppp_impl.h"
-#include "netif/ppp/lcp.h"
-#include "netif/ppp/ipcp.h"
-#include "netif/ppp/pppoe.h"
-
-/* Memory pool */
-LWIP_MEMPOOL_DECLARE(PPPOE_IF, MEMP_NUM_PPPOE_INTERFACES, sizeof(struct pppoe_softc), "PPPOE_IF")
-
-/* Add a 16 bit unsigned value to a buffer pointed to by PTR */
-#define PPPOE_ADD_16(PTR, VAL) \
- *(PTR)++ = (u8_t)((VAL) / 256); \
- *(PTR)++ = (u8_t)((VAL) % 256)
-
-/* Add a complete PPPoE header to the buffer pointed to by PTR */
-#define PPPOE_ADD_HEADER(PTR, CODE, SESS, LEN) \
- *(PTR)++ = PPPOE_VERTYPE; \
- *(PTR)++ = (CODE); \
- PPPOE_ADD_16(PTR, SESS); \
- PPPOE_ADD_16(PTR, LEN)
-
-#define PPPOE_DISC_TIMEOUT (5*1000) /* base for quick timeout calculation */
-#define PPPOE_SLOW_RETRY (60*1000) /* persistent retry interval */
-#define PPPOE_DISC_MAXPADI 4 /* retry PADI four times (quickly) */
-#define PPPOE_DISC_MAXPADR 2 /* retry PADR twice */
-
-#ifdef PPPOE_SERVER
-#error "PPPOE_SERVER is not yet supported under lwIP!"
-/* from if_spppsubr.c */
-#define IFF_PASSIVE IFF_LINK0 /* wait passively for connection */
-#endif
-
-#define PPPOE_ERRORSTRING_LEN 64
-
-
-/* callbacks called from PPP core */
-static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p);
-static err_t pppoe_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol);
-static void pppoe_connect(ppp_pcb *ppp, void *ctx);
-static void pppoe_disconnect(ppp_pcb *ppp, void *ctx);
-static err_t pppoe_destroy(ppp_pcb *ppp, void *ctx);
-
-/* management routines */
-static void pppoe_abort_connect(struct pppoe_softc *);
-#if 0 /* UNUSED */
-static void pppoe_clear_softc(struct pppoe_softc *, const char *);
-#endif /* UNUSED */
-
-/* internal timeout handling */
-static void pppoe_timeout(void *);
-
-/* sending actual protocol controll packets */
-static err_t pppoe_send_padi(struct pppoe_softc *);
-static err_t pppoe_send_padr(struct pppoe_softc *);
-#ifdef PPPOE_SERVER
-static err_t pppoe_send_pado(struct pppoe_softc *);
-static err_t pppoe_send_pads(struct pppoe_softc *);
-#endif
-static err_t pppoe_send_padt(struct netif *, u_int, const u8_t *);
-
-/* internal helper functions */
-static err_t pppoe_xmit(struct pppoe_softc *sc, struct pbuf *pb);
-static struct pppoe_softc* pppoe_find_softc_by_session(u_int session, struct netif *rcvif);
-static struct pppoe_softc* pppoe_find_softc_by_hunique(u8_t *token, size_t len, struct netif *rcvif);
-
-/** linked list of created pppoe interfaces */
-static struct pppoe_softc *pppoe_softc_list;
-
-/* Callbacks structure for PPP core */
-static const struct link_callbacks pppoe_callbacks = {
- pppoe_connect,
-#if PPP_SERVER
- NULL,
-#endif /* PPP_SERVER */
- pppoe_disconnect,
- pppoe_destroy,
- pppoe_write,
- pppoe_netif_output,
- NULL,
- NULL
-};
-
-/*
- * Create a new PPP Over Ethernet (PPPoE) connection.
- *
- * Return 0 on success, an error code on failure.
- */
-ppp_pcb *pppoe_create(struct netif *pppif,
- struct netif *ethif,
- const char *service_name, const char *concentrator_name,
- ppp_link_status_cb_fn link_status_cb, void *ctx_cb)
-{
- ppp_pcb *ppp;
- struct pppoe_softc *sc;
- LWIP_UNUSED_ARG(service_name);
- LWIP_UNUSED_ARG(concentrator_name);
-
- sc = (struct pppoe_softc *)LWIP_MEMPOOL_ALLOC(PPPOE_IF);
- if (sc == NULL) {
- return NULL;
- }
-
- ppp = ppp_new(pppif, &pppoe_callbacks, sc, link_status_cb, ctx_cb);
- if (ppp == NULL) {
- LWIP_MEMPOOL_FREE(PPPOE_IF, sc);
- return NULL;
- }
-
- memset(sc, 0, sizeof(struct pppoe_softc));
- sc->pcb = ppp;
- sc->sc_ethif = ethif;
- /* put the new interface at the head of the list */
- sc->next = pppoe_softc_list;
- pppoe_softc_list = sc;
- return ppp;
-}
-
-/* Called by PPP core */
-static err_t pppoe_write(ppp_pcb *ppp, void *ctx, struct pbuf *p) {
- struct pppoe_softc *sc = (struct pppoe_softc *)ctx;
- struct pbuf *ph; /* Ethernet + PPPoE header */
- err_t ret;
-#if MIB2_STATS
- u16_t tot_len;
-#else /* MIB2_STATS */
- LWIP_UNUSED_ARG(ppp);
-#endif /* MIB2_STATS */
-
- /* skip address & flags */
- pbuf_header(p, -(s16_t)2);
-
- ph = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN), PBUF_RAM);
- if(!ph) {
- LINK_STATS_INC(link.memerr);
- LINK_STATS_INC(link.proterr);
- MIB2_STATS_NETIF_INC(ppp->netif, ifoutdiscards);
- pbuf_free(p);
- return ERR_MEM;
- }
-
- pbuf_header(ph, -(s16_t)PPPOE_HEADERLEN); /* hide PPPoE header */
- pbuf_cat(ph, p);
-#if MIB2_STATS
- tot_len = ph->tot_len;
-#endif /* MIB2_STATS */
-
- ret = pppoe_xmit(sc, ph);
- if (ret != ERR_OK) {
- LINK_STATS_INC(link.err);
- MIB2_STATS_NETIF_INC(ppp->netif, ifoutdiscards);
- return ret;
- }
-
- MIB2_STATS_NETIF_ADD(ppp->netif, ifoutoctets, (u16_t)tot_len);
- MIB2_STATS_NETIF_INC(ppp->netif, ifoutucastpkts);
- LINK_STATS_INC(link.xmit);
- return ERR_OK;
-}
-
-/* Called by PPP core */
-static err_t pppoe_netif_output(ppp_pcb *ppp, void *ctx, struct pbuf *p, u_short protocol) {
- struct pppoe_softc *sc = (struct pppoe_softc *)ctx;
- struct pbuf *pb;
- u8_t *pl;
- err_t err;
-#if MIB2_STATS
- u16_t tot_len;
-#else /* MIB2_STATS */
- LWIP_UNUSED_ARG(ppp);
-#endif /* MIB2_STATS */
-
- /* @todo: try to use pbuf_header() here! */
- pb = pbuf_alloc(PBUF_LINK, PPPOE_HEADERLEN + sizeof(protocol), PBUF_RAM);
- if(!pb) {
- LINK_STATS_INC(link.memerr);
- LINK_STATS_INC(link.proterr);
- MIB2_STATS_NETIF_INC(ppp->netif, ifoutdiscards);
- return ERR_MEM;
- }
-
- pbuf_header(pb, -(s16_t)PPPOE_HEADERLEN);
-
- pl = (u8_t*)pb->payload;
- PUTSHORT(protocol, pl);
-
- pbuf_chain(pb, p);
-#if MIB2_STATS
- tot_len = pb->tot_len;
-#endif /* MIB2_STATS */
-
- if( (err = pppoe_xmit(sc, pb)) != ERR_OK) {
- LINK_STATS_INC(link.err);
- MIB2_STATS_NETIF_INC(ppp->netif, ifoutdiscards);
- return err;
- }
-
- MIB2_STATS_NETIF_ADD(ppp->netif, ifoutoctets, tot_len);
- MIB2_STATS_NETIF_INC(ppp->netif, ifoutucastpkts);
- LINK_STATS_INC(link.xmit);
- return ERR_OK;
-}
-
-static err_t
-pppoe_destroy(ppp_pcb *ppp, void *ctx)
-{
- struct pppoe_softc *sc = (struct pppoe_softc *)ctx;
- struct pppoe_softc **copp, *freep;
- LWIP_UNUSED_ARG(ppp);
-
- sys_untimeout(pppoe_timeout, sc);
-
- /* remove interface from list */
- for (copp = &pppoe_softc_list; (freep = *copp); copp = &freep->next) {
- if (freep == sc) {
- *copp = freep->next;
- break;
- }
- }
-
-#ifdef PPPOE_TODO
- if (sc->sc_concentrator_name) {
- mem_free(sc->sc_concentrator_name);
- }
- if (sc->sc_service_name) {
- mem_free(sc->sc_service_name);
- }
-#endif /* PPPOE_TODO */
- LWIP_MEMPOOL_FREE(PPPOE_IF, sc);
-
- return ERR_OK;
-}
-
-/*
- * Find the interface handling the specified session.
- * Note: O(number of sessions open), this is a client-side only, mean
- * and lean implementation, so number of open sessions typically should
- * be 1.
- */
-static struct pppoe_softc* pppoe_find_softc_by_session(u_int session, struct netif *rcvif) {
- struct pppoe_softc *sc;
-
- for (sc = pppoe_softc_list; sc != NULL; sc = sc->next) {
- if (sc->sc_state == PPPOE_STATE_SESSION
- && sc->sc_session == session
- && sc->sc_ethif == rcvif) {
- return sc;
- }
- }
- return NULL;
-}
-
-/* Check host unique token passed and return appropriate softc pointer,
- * or NULL if token is bogus. */
-static struct pppoe_softc* pppoe_find_softc_by_hunique(u8_t *token, size_t len, struct netif *rcvif) {
- struct pppoe_softc *sc, *t;
-
- if (len != sizeof sc) {
- return NULL;
- }
- MEMCPY(&t, token, len);
-
- for (sc = pppoe_softc_list; sc != NULL; sc = sc->next) {
- if (sc == t) {
- break;
- }
- }
-
- if (sc == NULL) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: alien host unique tag, no session found\n"));
- return NULL;
- }
-
- /* should be safe to access *sc now */
- if (sc->sc_state < PPPOE_STATE_PADI_SENT || sc->sc_state >= PPPOE_STATE_SESSION) {
- PPPDEBUG(LOG_DEBUG, ("%c%c%"U16_F": host unique tag found, but it belongs to a connection in state %d\n",
- sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, sc->sc_state));
- return NULL;
- }
- if (sc->sc_ethif != rcvif) {
- PPPDEBUG(LOG_DEBUG, ("%c%c%"U16_F": wrong interface, not accepting host unique\n",
- sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
- return NULL;
- }
- return sc;
-}
-
-/* analyze and handle a single received packet while not in session state */
-void
-pppoe_disc_input(struct netif *netif, struct pbuf *pb)
-{
- u16_t tag, len;
- u16_t session, plen;
- struct pppoe_softc *sc;
-#if PPP_DEBUG
- const char *err_msg = NULL;
-#endif /* PPP_DEBUG */
- u8_t *ac_cookie;
- u16_t ac_cookie_len;
-#ifdef PPPOE_SERVER
- u8_t *hunique;
- size_t hunique_len;
-#endif
- struct pppoehdr *ph;
- struct pppoetag pt;
- int off, err;
- struct eth_hdr *ethhdr;
-
- /* don't do anything if there is not a single PPPoE instance */
- if (pppoe_softc_list == NULL) {
- pbuf_free(pb);
- return;
- }
-
- pb = ppp_singlebuf(pb);
-
- if (pb->len < sizeof(*ethhdr)) {
- goto done;
- }
- ethhdr = (struct eth_hdr *)pb->payload;
- off = sizeof(*ethhdr);
-
- ac_cookie = NULL;
- ac_cookie_len = 0;
-#ifdef PPPOE_SERVER
- hunique = NULL;
- hunique_len = 0;
-#endif
- session = 0;
- if (pb->len - off < (u16_t)PPPOE_HEADERLEN) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: packet too short: %d\n", pb->len));
- goto done;
- }
-
- ph = (struct pppoehdr *) (ethhdr + 1);
- if (ph->vertype != PPPOE_VERTYPE) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: unknown version/type packet: 0x%x\n", ph->vertype));
- goto done;
- }
- session = lwip_ntohs(ph->session);
- plen = lwip_ntohs(ph->plen);
- off += sizeof(*ph);
-
- if (plen + off > pb->len) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: packet content does not fit: data available = %d, packet size = %u\n",
- pb->len - off, plen));
- goto done;
- }
- if(pb->tot_len == pb->len) {
- pb->tot_len = pb->len = (u16_t)off + plen; /* ignore trailing garbage */
- }
- tag = 0;
- len = 0;
- sc = NULL;
- while (off + sizeof(pt) <= pb->len) {
- MEMCPY(&pt, (u8_t*)pb->payload + off, sizeof(pt));
- tag = lwip_ntohs(pt.tag);
- len = lwip_ntohs(pt.len);
- if (off + sizeof(pt) + len > pb->len) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: tag 0x%x len 0x%x is too long\n", tag, len));
- goto done;
- }
- switch (tag) {
- case PPPOE_TAG_EOL:
- goto breakbreak;
- case PPPOE_TAG_SNAME:
- break; /* ignored */
- case PPPOE_TAG_ACNAME:
- break; /* ignored */
- case PPPOE_TAG_HUNIQUE:
- if (sc != NULL) {
- break;
- }
-#ifdef PPPOE_SERVER
- hunique = (u8_t*)pb->payload + off + sizeof(pt);
- hunique_len = len;
-#endif
- sc = pppoe_find_softc_by_hunique((u8_t*)pb->payload + off + sizeof(pt), len, netif);
- break;
- case PPPOE_TAG_ACCOOKIE:
- if (ac_cookie == NULL) {
- if (len > PPPOE_MAX_AC_COOKIE_LEN) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: AC cookie is too long: len = %d, max = %d\n", len, PPPOE_MAX_AC_COOKIE_LEN));
- goto done;
- }
- ac_cookie = (u8_t*)pb->payload + off + sizeof(pt);
- ac_cookie_len = len;
- }
- break;
-#if PPP_DEBUG
- case PPPOE_TAG_SNAME_ERR:
- err_msg = "SERVICE NAME ERROR";
- break;
- case PPPOE_TAG_ACSYS_ERR:
- err_msg = "AC SYSTEM ERROR";
- break;
- case PPPOE_TAG_GENERIC_ERR:
- err_msg = "GENERIC ERROR";
- break;
-#endif /* PPP_DEBUG */
- default:
- break;
- }
-#if PPP_DEBUG
- if (err_msg != NULL) {
- char error_tmp[PPPOE_ERRORSTRING_LEN];
- u16_t error_len = LWIP_MIN(len, sizeof(error_tmp)-1);
- strncpy(error_tmp, (char*)pb->payload + off + sizeof(pt), error_len);
- error_tmp[error_len] = '\0';
- if (sc) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": %s: %s\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err_msg, error_tmp));
- } else {
- PPPDEBUG(LOG_DEBUG, ("pppoe: %s: %s\n", err_msg, error_tmp));
- }
- }
-#endif /* PPP_DEBUG */
- off += sizeof(pt) + len;
- }
-
-breakbreak:;
- switch (ph->code) {
- case PPPOE_CODE_PADI:
-#ifdef PPPOE_SERVER
- /*
- * got service name, concentrator name, and/or host unique.
- * ignore if we have no interfaces with IFF_PASSIVE|IFF_UP.
- */
- if (LIST_EMPTY(&pppoe_softc_list)) {
- goto done;
- }
- LIST_FOREACH(sc, &pppoe_softc_list, sc_list) {
- if (!(sc->sc_sppp.pp_if.if_flags & IFF_UP)) {
- continue;
- }
- if (!(sc->sc_sppp.pp_if.if_flags & IFF_PASSIVE)) {
- continue;
- }
- if (sc->sc_state == PPPOE_STATE_INITIAL) {
- break;
- }
- }
- if (sc == NULL) {
- /* PPPDEBUG(LOG_DEBUG, ("pppoe: free passive interface is not found\n")); */
- goto done;
- }
- if (hunique) {
- if (sc->sc_hunique) {
- mem_free(sc->sc_hunique);
- }
- sc->sc_hunique = mem_malloc(hunique_len);
- if (sc->sc_hunique == NULL) {
- goto done;
- }
- sc->sc_hunique_len = hunique_len;
- MEMCPY(sc->sc_hunique, hunique, hunique_len);
- }
- MEMCPY(&sc->sc_dest, eh->ether_shost, sizeof sc->sc_dest);
- sc->sc_state = PPPOE_STATE_PADO_SENT;
- pppoe_send_pado(sc);
- break;
-#endif /* PPPOE_SERVER */
- case PPPOE_CODE_PADR:
-#ifdef PPPOE_SERVER
- /*
- * get sc from ac_cookie if IFF_PASSIVE
- */
- if (ac_cookie == NULL) {
- /* be quiet if there is not a single pppoe instance */
- PPPDEBUG(LOG_DEBUG, ("pppoe: received PADR but not includes ac_cookie\n"));
- goto done;
- }
- sc = pppoe_find_softc_by_hunique(ac_cookie, ac_cookie_len, netif);
- if (sc == NULL) {
- /* be quiet if there is not a single pppoe instance */
- if (!LIST_EMPTY(&pppoe_softc_list)) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: received PADR but could not find request for it\n"));
- }
- goto done;
- }
- if (sc->sc_state != PPPOE_STATE_PADO_SENT) {
- PPPDEBUG(LOG_DEBUG, ("%c%c%"U16_F": received unexpected PADR\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
- goto done;
- }
- if (hunique) {
- if (sc->sc_hunique) {
- mem_free(sc->sc_hunique);
- }
- sc->sc_hunique = mem_malloc(hunique_len);
- if (sc->sc_hunique == NULL) {
- goto done;
- }
- sc->sc_hunique_len = hunique_len;
- MEMCPY(sc->sc_hunique, hunique, hunique_len);
- }
- pppoe_send_pads(sc);
- sc->sc_state = PPPOE_STATE_SESSION;
- ppp_start(sc->pcb); /* notify upper layers */
- break;
-#else
- /* ignore, we are no access concentrator */
- goto done;
-#endif /* PPPOE_SERVER */
- case PPPOE_CODE_PADO:
- if (sc == NULL) {
- /* be quiet if there is not a single pppoe instance */
- if (pppoe_softc_list != NULL) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: received PADO but could not find request for it\n"));
- }
- goto done;
- }
- if (sc->sc_state != PPPOE_STATE_PADI_SENT) {
- PPPDEBUG(LOG_DEBUG, ("%c%c%"U16_F": received unexpected PADO\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
- goto done;
- }
- if (ac_cookie) {
- sc->sc_ac_cookie_len = ac_cookie_len;
- MEMCPY(sc->sc_ac_cookie, ac_cookie, ac_cookie_len);
- }
- MEMCPY(&sc->sc_dest, ethhdr->src.addr, sizeof(sc->sc_dest.addr));
- sys_untimeout(pppoe_timeout, sc);
- sc->sc_padr_retried = 0;
- sc->sc_state = PPPOE_STATE_PADR_SENT;
- if ((err = pppoe_send_padr(sc)) != 0) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": failed to send PADR, error=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err));
- }
- sys_timeout(PPPOE_DISC_TIMEOUT * (1 + sc->sc_padr_retried), pppoe_timeout, sc);
- break;
- case PPPOE_CODE_PADS:
- if (sc == NULL) {
- goto done;
- }
- sc->sc_session = session;
- sys_untimeout(pppoe_timeout, sc);
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": session 0x%x connected\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, session));
- sc->sc_state = PPPOE_STATE_SESSION;
- ppp_start(sc->pcb); /* notify upper layers */
- break;
- case PPPOE_CODE_PADT:
- /* Don't disconnect here, we let the LCP Echo/Reply find the fact
- * that PPP session is down. Asking the PPP stack to end the session
- * require strict checking about the PPP phase to prevent endless
- * disconnection loops.
- */
-#if 0 /* UNUSED */
- if (sc == NULL) { /* PADT frames are rarely sent with a hunique tag, this is actually almost always true */
- goto done;
- }
- pppoe_clear_softc(sc, "received PADT");
-#endif /* UNUSED */
- break;
- default:
- if(sc) {
- PPPDEBUG(LOG_DEBUG, ("%c%c%"U16_F": unknown code (0x%"X16_F") session = 0x%"X16_F"\n",
- sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num,
- (u16_t)ph->code, session));
- } else {
- PPPDEBUG(LOG_DEBUG, ("pppoe: unknown code (0x%"X16_F") session = 0x%"X16_F"\n", (u16_t)ph->code, session));
- }
- break;
- }
-
-done:
- pbuf_free(pb);
- return;
-}
-
-void
-pppoe_data_input(struct netif *netif, struct pbuf *pb)
-{
- u16_t session, plen;
- struct pppoe_softc *sc;
- struct pppoehdr *ph;
-#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
- u8_t shost[ETHER_ADDR_LEN];
-#endif
-
-#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
- MEMCPY(shost, ((struct eth_hdr *)pb->payload)->src.addr, sizeof(shost));
-#endif
- if (pbuf_header(pb, -(s16_t)sizeof(struct eth_hdr)) != 0) {
- /* bail out */
- PPPDEBUG(LOG_ERR, ("pppoe_data_input: pbuf_header failed\n"));
- LINK_STATS_INC(link.lenerr);
- goto drop;
- }
-
- if (pb->len < sizeof(*ph)) {
- PPPDEBUG(LOG_DEBUG, ("pppoe_data_input: could not get PPPoE header\n"));
- goto drop;
- }
- ph = (struct pppoehdr *)pb->payload;
-
- if (ph->vertype != PPPOE_VERTYPE) {
- PPPDEBUG(LOG_DEBUG, ("pppoe (data): unknown version/type packet: 0x%x\n", ph->vertype));
- goto drop;
- }
- if (ph->code != 0) {
- goto drop;
- }
-
- session = lwip_ntohs(ph->session);
- sc = pppoe_find_softc_by_session(session, netif);
- if (sc == NULL) {
-#ifdef PPPOE_TERM_UNKNOWN_SESSIONS
- PPPDEBUG(LOG_DEBUG, ("pppoe: input for unknown session 0x%x, sending PADT\n", session));
- pppoe_send_padt(netif, session, shost);
-#endif
- goto drop;
- }
-
- plen = lwip_ntohs(ph->plen);
-
- if (pbuf_header(pb, -(s16_t)(PPPOE_HEADERLEN)) != 0) {
- /* bail out */
- PPPDEBUG(LOG_ERR, ("pppoe_data_input: pbuf_header PPPOE_HEADERLEN failed\n"));
- LINK_STATS_INC(link.lenerr);
- goto drop;
- }
-
- PPPDEBUG(LOG_DEBUG, ("pppoe_data_input: %c%c%"U16_F": pkthdr.len=%d, pppoe.len=%d\n",
- sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num,
- pb->len, plen));
-
- if (pb->tot_len < plen) {
- goto drop;
- }
-
- /* Dispatch the packet thereby consuming it. */
- ppp_input(sc->pcb, pb);
- return;
-
-drop:
- pbuf_free(pb);
-}
-
-static err_t
-pppoe_output(struct pppoe_softc *sc, struct pbuf *pb)
-{
- struct eth_hdr *ethhdr;
- u16_t etype;
- err_t res;
-
- /* make room for Ethernet header - should not fail */
- if (pbuf_header(pb, (s16_t)(sizeof(struct eth_hdr))) != 0) {
- /* bail out */
- PPPDEBUG(LOG_ERR, ("pppoe: %c%c%"U16_F": pppoe_output: could not allocate room for Ethernet header\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
- LINK_STATS_INC(link.lenerr);
- pbuf_free(pb);
- return ERR_BUF;
- }
- ethhdr = (struct eth_hdr *)pb->payload;
- etype = sc->sc_state == PPPOE_STATE_SESSION ? ETHTYPE_PPPOE : ETHTYPE_PPPOEDISC;
- ethhdr->type = lwip_htons(etype);
- MEMCPY(ðhdr->dest.addr, &sc->sc_dest.addr, sizeof(ethhdr->dest.addr));
- MEMCPY(ðhdr->src.addr, &sc->sc_ethif->hwaddr, sizeof(ethhdr->src.addr));
-
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F" (%x) state=%d, session=0x%x output -> %02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F":%02"X16_F", len=%d\n",
- sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, etype,
- sc->sc_state, sc->sc_session,
- sc->sc_dest.addr[0], sc->sc_dest.addr[1], sc->sc_dest.addr[2], sc->sc_dest.addr[3], sc->sc_dest.addr[4], sc->sc_dest.addr[5],
- pb->tot_len));
-
- res = sc->sc_ethif->linkoutput(sc->sc_ethif, pb);
-
- pbuf_free(pb);
-
- return res;
-}
-
-static err_t
-pppoe_send_padi(struct pppoe_softc *sc)
-{
- struct pbuf *pb;
- u8_t *p;
- int len;
-#ifdef PPPOE_TODO
- int l1 = 0, l2 = 0; /* XXX: gcc */
-#endif /* PPPOE_TODO */
-
- /* calculate length of frame (excluding ethernet header + pppoe header) */
- len = 2 + 2 + 2 + 2 + sizeof sc; /* service name tag is required, host unique is send too */
-#ifdef PPPOE_TODO
- if (sc->sc_service_name != NULL) {
- l1 = (int)strlen(sc->sc_service_name);
- len += l1;
- }
- if (sc->sc_concentrator_name != NULL) {
- l2 = (int)strlen(sc->sc_concentrator_name);
- len += 2 + 2 + l2;
- }
-#endif /* PPPOE_TODO */
- LWIP_ASSERT("sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff",
- sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff);
-
- /* allocate a buffer */
- pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN + len), PBUF_RAM);
- if (!pb) {
- return ERR_MEM;
- }
- LWIP_ASSERT("pb->tot_len == pb->len", pb->tot_len == pb->len);
-
- p = (u8_t*)pb->payload;
- /* fill in pkt */
- PPPOE_ADD_HEADER(p, PPPOE_CODE_PADI, 0, (u16_t)len);
- PPPOE_ADD_16(p, PPPOE_TAG_SNAME);
-#ifdef PPPOE_TODO
- if (sc->sc_service_name != NULL) {
- PPPOE_ADD_16(p, l1);
- MEMCPY(p, sc->sc_service_name, l1);
- p += l1;
- } else
-#endif /* PPPOE_TODO */
- {
- PPPOE_ADD_16(p, 0);
- }
-#ifdef PPPOE_TODO
- if (sc->sc_concentrator_name != NULL) {
- PPPOE_ADD_16(p, PPPOE_TAG_ACNAME);
- PPPOE_ADD_16(p, l2);
- MEMCPY(p, sc->sc_concentrator_name, l2);
- p += l2;
- }
-#endif /* PPPOE_TODO */
- PPPOE_ADD_16(p, PPPOE_TAG_HUNIQUE);
- PPPOE_ADD_16(p, sizeof(sc));
- MEMCPY(p, &sc, sizeof sc);
-
- /* send pkt */
- return pppoe_output(sc, pb);
-}
-
-static void
-pppoe_timeout(void *arg)
-{
- u32_t retry_wait;
- int err;
- struct pppoe_softc *sc = (struct pppoe_softc*)arg;
-
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": timeout\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
-
- switch (sc->sc_state) {
- case PPPOE_STATE_PADI_SENT:
- /*
- * We have two basic ways of retrying:
- * - Quick retry mode: try a few times in short sequence
- * - Slow retry mode: we already had a connection successfully
- * established and will try infinitely (without user
- * intervention)
- * We only enter slow retry mode if IFF_LINK1 (aka autodial)
- * is not set.
- */
- if (sc->sc_padi_retried < 0xff) {
- sc->sc_padi_retried++;
- }
- if (!sc->pcb->settings.persist && sc->sc_padi_retried >= PPPOE_DISC_MAXPADI) {
-#if 0
- if ((sc->sc_sppp.pp_if.if_flags & IFF_LINK1) == 0) {
- /* slow retry mode */
- retry_wait = PPPOE_SLOW_RETRY;
- } else
-#endif
- {
- pppoe_abort_connect(sc);
- return;
- }
- }
- /* initialize for quick retry mode */
- retry_wait = LWIP_MIN(PPPOE_DISC_TIMEOUT * sc->sc_padi_retried, PPPOE_SLOW_RETRY);
- if ((err = pppoe_send_padi(sc)) != 0) {
- sc->sc_padi_retried--;
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": failed to transmit PADI, error=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err));
- }
- sys_timeout(retry_wait, pppoe_timeout, sc);
- break;
-
- case PPPOE_STATE_PADR_SENT:
- sc->sc_padr_retried++;
- if (sc->sc_padr_retried >= PPPOE_DISC_MAXPADR) {
- MEMCPY(&sc->sc_dest, ethbroadcast.addr, sizeof(sc->sc_dest));
- sc->sc_state = PPPOE_STATE_PADI_SENT;
- sc->sc_padr_retried = 0;
- if ((err = pppoe_send_padi(sc)) != 0) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": failed to send PADI, error=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err));
- }
- sys_timeout(PPPOE_DISC_TIMEOUT * (1 + sc->sc_padi_retried), pppoe_timeout, sc);
- return;
- }
- if ((err = pppoe_send_padr(sc)) != 0) {
- sc->sc_padr_retried--;
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": failed to send PADR, error=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err));
- }
- sys_timeout(PPPOE_DISC_TIMEOUT * (1 + sc->sc_padr_retried), pppoe_timeout, sc);
- break;
- default:
- return; /* all done, work in peace */
- }
-}
-
-/* Start a connection (i.e. initiate discovery phase) */
-static void
-pppoe_connect(ppp_pcb *ppp, void *ctx)
-{
- err_t err;
- struct pppoe_softc *sc = (struct pppoe_softc *)ctx;
- lcp_options *lcp_wo;
- lcp_options *lcp_ao;
-#if PPP_IPV4_SUPPORT && VJ_SUPPORT
- ipcp_options *ipcp_wo;
- ipcp_options *ipcp_ao;
-#endif /* PPP_IPV4_SUPPORT && VJ_SUPPORT */
-
- sc->sc_session = 0;
- sc->sc_ac_cookie_len = 0;
- sc->sc_padi_retried = 0;
- sc->sc_padr_retried = 0;
- /* changed to real address later */
- MEMCPY(&sc->sc_dest, ethbroadcast.addr, sizeof(sc->sc_dest));
-#ifdef PPPOE_SERVER
- /* wait PADI if IFF_PASSIVE */
- if ((sc->sc_sppp.pp_if.if_flags & IFF_PASSIVE)) {
- return 0;
- }
-#endif
-
- lcp_wo = &ppp->lcp_wantoptions;
- lcp_wo->mru = sc->sc_ethif->mtu-PPPOE_HEADERLEN-2; /* two byte PPP protocol discriminator, then IP data */
- lcp_wo->neg_asyncmap = 0;
- lcp_wo->neg_pcompression = 0;
- lcp_wo->neg_accompression = 0;
- lcp_wo->passive = 0;
- lcp_wo->silent = 0;
-
- lcp_ao = &ppp->lcp_allowoptions;
- lcp_ao->mru = sc->sc_ethif->mtu-PPPOE_HEADERLEN-2; /* two byte PPP protocol discriminator, then IP data */
- lcp_ao->neg_asyncmap = 0;
- lcp_ao->neg_pcompression = 0;
- lcp_ao->neg_accompression = 0;
-
-#if PPP_IPV4_SUPPORT && VJ_SUPPORT
- ipcp_wo = &ppp->ipcp_wantoptions;
- ipcp_wo->neg_vj = 0;
- ipcp_wo->old_vj = 0;
-
- ipcp_ao = &ppp->ipcp_allowoptions;
- ipcp_ao->neg_vj = 0;
- ipcp_ao->old_vj = 0;
-#endif /* PPP_IPV4_SUPPORT && VJ_SUPPORT */
-
- /* save state, in case we fail to send PADI */
- sc->sc_state = PPPOE_STATE_PADI_SENT;
- if ((err = pppoe_send_padi(sc)) != 0) {
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": failed to send PADI, error=%d\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, err));
- }
- sys_timeout(PPPOE_DISC_TIMEOUT, pppoe_timeout, sc);
-}
-
-/* disconnect */
-static void
-pppoe_disconnect(ppp_pcb *ppp, void *ctx)
-{
- struct pppoe_softc *sc = (struct pppoe_softc *)ctx;
-
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": disconnecting\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
- if (sc->sc_state == PPPOE_STATE_SESSION) {
- pppoe_send_padt(sc->sc_ethif, sc->sc_session, (const u8_t *)&sc->sc_dest);
- }
-
- /* stop any timer, disconnect can be called while initiating is in progress */
- sys_untimeout(pppoe_timeout, sc);
- sc->sc_state = PPPOE_STATE_INITIAL;
-#ifdef PPPOE_SERVER
- if (sc->sc_hunique) {
- mem_free(sc->sc_hunique);
- sc->sc_hunique = NULL; /* probably not necessary, if state is initial we shouldn't have to access hunique anyway */
- }
- sc->sc_hunique_len = 0; /* probably not necessary, if state is initial we shouldn't have to access hunique anyway */
-#endif
- ppp_link_end(ppp); /* notify upper layers */
- return;
-}
-
-/* Connection attempt aborted */
-static void
-pppoe_abort_connect(struct pppoe_softc *sc)
-{
- PPPDEBUG(LOG_DEBUG, ("%c%c%"U16_F": could not establish connection\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
- sc->sc_state = PPPOE_STATE_INITIAL;
- ppp_link_failed(sc->pcb); /* notify upper layers */
-}
-
-/* Send a PADR packet */
-static err_t
-pppoe_send_padr(struct pppoe_softc *sc)
-{
- struct pbuf *pb;
- u8_t *p;
- size_t len;
-#ifdef PPPOE_TODO
- size_t l1 = 0; /* XXX: gcc */
-#endif /* PPPOE_TODO */
-
- len = 2 + 2 + 2 + 2 + sizeof(sc); /* service name, host unique */
-#ifdef PPPOE_TODO
- if (sc->sc_service_name != NULL) { /* service name tag maybe empty */
- l1 = strlen(sc->sc_service_name);
- len += l1;
- }
-#endif /* PPPOE_TODO */
- if (sc->sc_ac_cookie_len > 0) {
- len += 2 + 2 + sc->sc_ac_cookie_len; /* AC cookie */
- }
- LWIP_ASSERT("sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff",
- sizeof(struct eth_hdr) + PPPOE_HEADERLEN + len <= 0xffff);
- pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN + len), PBUF_RAM);
- if (!pb) {
- return ERR_MEM;
- }
- LWIP_ASSERT("pb->tot_len == pb->len", pb->tot_len == pb->len);
- p = (u8_t*)pb->payload;
- PPPOE_ADD_HEADER(p, PPPOE_CODE_PADR, 0, len);
- PPPOE_ADD_16(p, PPPOE_TAG_SNAME);
-#ifdef PPPOE_TODO
- if (sc->sc_service_name != NULL) {
- PPPOE_ADD_16(p, l1);
- MEMCPY(p, sc->sc_service_name, l1);
- p += l1;
- } else
-#endif /* PPPOE_TODO */
- {
- PPPOE_ADD_16(p, 0);
- }
- if (sc->sc_ac_cookie_len > 0) {
- PPPOE_ADD_16(p, PPPOE_TAG_ACCOOKIE);
- PPPOE_ADD_16(p, sc->sc_ac_cookie_len);
- MEMCPY(p, sc->sc_ac_cookie, sc->sc_ac_cookie_len);
- p += sc->sc_ac_cookie_len;
- }
- PPPOE_ADD_16(p, PPPOE_TAG_HUNIQUE);
- PPPOE_ADD_16(p, sizeof(sc));
- MEMCPY(p, &sc, sizeof sc);
-
- return pppoe_output(sc, pb);
-}
-
-/* send a PADT packet */
-static err_t
-pppoe_send_padt(struct netif *outgoing_if, u_int session, const u8_t *dest)
-{
- struct pbuf *pb;
- struct eth_hdr *ethhdr;
- err_t res;
- u8_t *p;
-
- pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN), PBUF_RAM);
- if (!pb) {
- return ERR_MEM;
- }
- LWIP_ASSERT("pb->tot_len == pb->len", pb->tot_len == pb->len);
-
- pbuf_header(pb, (s16_t)sizeof(struct eth_hdr));
- ethhdr = (struct eth_hdr *)pb->payload;
- ethhdr->type = PP_HTONS(ETHTYPE_PPPOEDISC);
- MEMCPY(ðhdr->dest.addr, dest, sizeof(ethhdr->dest.addr));
- MEMCPY(ðhdr->src.addr, &outgoing_if->hwaddr, sizeof(ethhdr->src.addr));
-
- p = (u8_t*)(ethhdr + 1);
- PPPOE_ADD_HEADER(p, PPPOE_CODE_PADT, session, 0);
-
- res = outgoing_if->linkoutput(outgoing_if, pb);
-
- pbuf_free(pb);
-
- return res;
-}
-
-#ifdef PPPOE_SERVER
-static err_t
-pppoe_send_pado(struct pppoe_softc *sc)
-{
- struct pbuf *pb;
- u8_t *p;
- size_t len;
-
- /* calc length */
- len = 0;
- /* include ac_cookie */
- len += 2 + 2 + sizeof(sc);
- /* include hunique */
- len += 2 + 2 + sc->sc_hunique_len;
- pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN + len), PBUF_RAM);
- if (!pb) {
- return ERR_MEM;
- }
- LWIP_ASSERT("pb->tot_len == pb->len", pb->tot_len == pb->len);
- p = (u8_t*)pb->payload;
- PPPOE_ADD_HEADER(p, PPPOE_CODE_PADO, 0, len);
- PPPOE_ADD_16(p, PPPOE_TAG_ACCOOKIE);
- PPPOE_ADD_16(p, sizeof(sc));
- MEMCPY(p, &sc, sizeof(sc));
- p += sizeof(sc);
- PPPOE_ADD_16(p, PPPOE_TAG_HUNIQUE);
- PPPOE_ADD_16(p, sc->sc_hunique_len);
- MEMCPY(p, sc->sc_hunique, sc->sc_hunique_len);
- return pppoe_output(sc, pb);
-}
-
-static err_t
-pppoe_send_pads(struct pppoe_softc *sc)
-{
- struct pbuf *pb;
- u8_t *p;
- size_t len, l1 = 0; /* XXX: gcc */
-
- sc->sc_session = mono_time.tv_sec % 0xff + 1;
- /* calc length */
- len = 0;
- /* include hunique */
- len += 2 + 2 + 2 + 2 + sc->sc_hunique_len; /* service name, host unique*/
- if (sc->sc_service_name != NULL) { /* service name tag maybe empty */
- l1 = strlen(sc->sc_service_name);
- len += l1;
- }
- pb = pbuf_alloc(PBUF_LINK, (u16_t)(PPPOE_HEADERLEN + len), PBUF_RAM);
- if (!pb) {
- return ERR_MEM;
- }
- LWIP_ASSERT("pb->tot_len == pb->len", pb->tot_len == pb->len);
- p = (u8_t*)pb->payload;
- PPPOE_ADD_HEADER(p, PPPOE_CODE_PADS, sc->sc_session, len);
- PPPOE_ADD_16(p, PPPOE_TAG_SNAME);
- if (sc->sc_service_name != NULL) {
- PPPOE_ADD_16(p, l1);
- MEMCPY(p, sc->sc_service_name, l1);
- p += l1;
- } else {
- PPPOE_ADD_16(p, 0);
- }
- PPPOE_ADD_16(p, PPPOE_TAG_HUNIQUE);
- PPPOE_ADD_16(p, sc->sc_hunique_len);
- MEMCPY(p, sc->sc_hunique, sc->sc_hunique_len);
- return pppoe_output(sc, pb);
-}
-#endif
-
-static err_t
-pppoe_xmit(struct pppoe_softc *sc, struct pbuf *pb)
-{
- u8_t *p;
- size_t len;
-
- len = pb->tot_len;
-
- /* make room for PPPoE header - should not fail */
- if (pbuf_header(pb, (s16_t)(PPPOE_HEADERLEN)) != 0) {
- /* bail out */
- PPPDEBUG(LOG_ERR, ("pppoe: %c%c%"U16_F": pppoe_xmit: could not allocate room for PPPoE header\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
- LINK_STATS_INC(link.lenerr);
- pbuf_free(pb);
- return ERR_BUF;
- }
-
- p = (u8_t*)pb->payload;
- PPPOE_ADD_HEADER(p, 0, sc->sc_session, len);
-
- return pppoe_output(sc, pb);
-}
-
-#if 0 /*def PFIL_HOOKS*/
-static int
-pppoe_ifattach_hook(void *arg, struct pbuf **mp, struct netif *ifp, int dir)
-{
- struct pppoe_softc *sc;
- int s;
-
- if (mp != (struct pbuf **)PFIL_IFNET_DETACH) {
- return 0;
- }
-
- LIST_FOREACH(sc, &pppoe_softc_list, sc_list) {
- if (sc->sc_ethif != ifp) {
- continue;
- }
- if (sc->sc_sppp.pp_if.if_flags & IFF_UP) {
- sc->sc_sppp.pp_if.if_flags &= ~(IFF_UP|IFF_RUNNING);
- PPPDEBUG(LOG_DEBUG, ("%c%c%"U16_F": ethernet interface detached, going down\n",
- sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num));
- }
- sc->sc_ethif = NULL;
- pppoe_clear_softc(sc, "ethernet interface detached");
- }
-
- return 0;
-}
-#endif
-
-#if 0 /* UNUSED */
-static void
-pppoe_clear_softc(struct pppoe_softc *sc, const char *message)
-{
- LWIP_UNUSED_ARG(message);
-
- /* stop timer */
- sys_untimeout(pppoe_timeout, sc);
- PPPDEBUG(LOG_DEBUG, ("pppoe: %c%c%"U16_F": session 0x%x terminated, %s\n", sc->sc_ethif->name[0], sc->sc_ethif->name[1], sc->sc_ethif->num, sc->sc_session, message));
- sc->sc_state = PPPOE_STATE_INITIAL;
- ppp_link_end(sc->pcb); /* notify upper layers - /!\ dangerous /!\ - see pppoe_disc_input() */
-}
-#endif /* UNUSED */
-#endif /* PPP_SUPPORT && PPPOE_SUPPORT */
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services