mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-01-30 12:32:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

PPP, PPPoE, removed devname variable from pppoe_disc_input()

Browse Source 
Only used for debug, reworked in a more clever way. It was actually broken
by design: setting an interface integer into a string without formatting
was quite a dumb idea.
This commit is contained in:
Sylvain Rochet 2015-03-02 00:45:19 +01:00
parent d28bb04a9c
commit b09c891290
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/netif/ppp/pppoe.c
View File

@ -392,7 +392,6 @@ pppoe_disc_input(struct netif *netif, struct pbuf *pb)
u16_t session, plen; u16_t session, plen;
struct pppoe_softc *sc; struct pppoe_softc *sc;
const char *err_msg; const char *err_msg;
char devname[6];
u8_t *ac_cookie; u8_t *ac_cookie;
u16_t ac_cookie_len; u16_t ac_cookie_len;
#ifdef PPPOE_SERVER #ifdef PPPOE_SERVER
@ -412,7 +411,6 @@ pppoe_disc_input(struct netif *netif, struct pbuf *pb)
pb = ppp_singlebuf(pb); pb = ppp_singlebuf(pb);
strcpy(devname, "pppoe"); /* as long as we don't know which instance */
err_msg = NULL; err_msg = NULL;
if (pb->len < sizeof(*ethhdr)) { if (pb->len < sizeof(*ethhdr)) {
goto done; goto done;
@ -476,12 +474,6 @@ pppoe_disc_input(struct netif *netif, struct pbuf *pb)
hunique_len = len; hunique_len = len;
#endif #endif
sc = pppoe_find_softc_by_hunique((u8_t*)pb->payload + off + sizeof(pt), len, netif); sc = pppoe_find_softc_by_hunique((u8_t*)pb->payload + off + sizeof(pt), len, netif);
if (sc != NULL) {
devname[0] = sc->sc_ethif->name[0];
devname[1] = sc->sc_ethif->name[1];
devname[2] = sc->sc_ethif->num;
devname[3] = '\0';
}
break; break;
case PPPOE_TAG_ACCOOKIE: case PPPOE_TAG_ACCOOKIE:
if (ac_cookie == NULL) { if (ac_cookie == NULL) {
@ -502,15 +494,15 @@ pppoe_disc_input(struct netif *netif, struct pbuf *pb)
break; break;
} }
#if PPP_DEBUG #if PPP_DEBUG
if (NULL != err_msg) { if (err_msg != NULL) {
if (len) { char error_tmp[PPPOE_ERRORSTRING_LEN];
char error_tmp[PPPOE_ERRORSTRING_LEN]; u16_t error_len = LWIP_MIN(len, sizeof(error_tmp)-1);
u16_t error_len = LWIP_MIN(len, sizeof(error_tmp)-1); strncpy(error_tmp, (char*)pb->payload + off + sizeof(pt), error_len);
strncpy(error_tmp, (char*)pb->payload + off + sizeof(pt), error_len); error_tmp[error_len] = '\0';
error_tmp[error_len] = '\0'; if (sc) {
PPPDEBUG(LOG_DEBUG, ("%s: %s: %s\n", devname, err_msg, error_tmp)); 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 { } else {
PPPDEBUG(LOG_DEBUG, ("%s: %s\n", devname, err_msg)); PPPDEBUG(LOG_DEBUG, ("pppoe: %s: %s\n", err_msg, error_tmp));
} }
} }
#endif /* PPP_DEBUG */ #endif /* PPP_DEBUG */