pppoe: custom host-uniq tag
PATCH v4 1/1 pppoe: custom host-uniq tag
Add pppoe 'host-uniq' option to set an arbitrary host-uniq tag instead of the pppd pid. Some ISPs use such tag to authenticate the CPE, so it must be set to a proper value to connect.
Signed-off-by Matteo Croce <[email protected]>
Signed-off-by Jo-Philipp Wich <[email protected]>
---
changes from v3:
fix a buffer overflow
document the new option in the help message
pppd/plugins/rp-pppoe/common.c | 14 +++---- pppd/plugins/rp-pppoe/discovery.c | 52 ++++++++++--------------- pppd/plugins/rp-pppoe/plugin.c | 15 ++++++- pppd/plugins/rp-pppoe/pppoe-discovery.c | 41 ++++++++++++------- pppd/plugins/rp-pppoe/pppoe.h | 30 +++++++++++++- 5 files changed, 96 insertions(+), 56 deletions(-)
pppd/plugins/rp-pppoe/common.c +5 -9
@@ -119,15 +119,11 @@ sendPADT(PPPoEConnection *conn, char const *msg) conn->session =0 ;/* If we're using Host-Uniq, copy it over */ -if (conn->useHostUniq) { -PPPoETag hostUniq; -pid_t pid =getpid (); - hostUniq.type =htons (TAG_HOST_UNIQ ); - hostUniq.length =htons (sizeof (pid)); -memcpy (hostUniq.payload, &pid,sizeof (pid)); -memcpy (cursor, &hostUniq,sizeof (pid) +TAG_HDR_SIZE ); - cursor +=sizeof (pid) +TAG_HDR_SIZE ; - plen +=sizeof (pid) +TAG_HDR_SIZE ; +if (conn->hostUniq.length) { +int len =ntohs (conn->hostUniq.length); +memcpy (cursor, &conn->hostUniq, len +TAG_HDR_SIZE ); + cursor += len +TAG_HDR_SIZE ; + plen += len +TAG_HDR_SIZE ; }/* Copy error message */
pppd/plugins/rp-pppoe/discovery.c +20 -32
82 lines not on this page · raw message
pppd/plugins/rp-pppoe/plugin.c +14 -1
@@ -68,6 +68,7 @@ static char *existingSession = NULL;static int printACNames =0 ;static char *pppoe_reqd_mac =NULL ;unsigned char pppoe_reqd_mac_addr[6 ]; +static char *host_uniq;static int PPPoEDevnameHook (char *cmd,char **argv,int doit);static option_t Options[] = {
@@ -85,6 +86,8 @@ static option_t Options[] = { "Be verbose about discovered access concentrators"}, {"pppoe-mac" , o_string, &pppoe_reqd_mac, "Only connect to specified MAC address" }, + { "host-uniq", o_string, &host_uniq, + "Set the Host-Uniq to the supplied hex string" }, { NULL } };int (*OldDevnameHook)(char *cmd,char **argv,int doit) =NULL ;
@@ -110,7 +113,6 @@ PPPOEInitDevice(void) conn->ifName = devnam; conn->discoverySocket =-1 ; conn->sessionSocket =-1 ; - conn->useHostUniq =1 ; conn->printACNames = printACNames; conn->discoveryTimeout =PADI_TIMEOUT ;return 1 ;
@@ -166,6 +168,17 @@ PPPOEConnectDevice(void)if (lcp_wantoptions[0 ].mru > ifr.ifr_mtu -TOTAL_OVERHEAD ) lcp_wantoptions[0 ].mru = ifr.ifr_mtu -TOTAL_OVERHEAD ; +if (host_uniq) { +if (!parseHostUniq (host_uniq, &conn->hostUniq)) +fatal ("Illegal value for host-uniq option" ); + }else { +/* if a custom host-uniq is not supplied, use our PID */ +pid_t pid =getpid (); + conn->hostUniq.type =htons (TAG_HOST_UNIQ ); + conn->hostUniq.length =htons (sizeof (pid)); +memcpy (conn->hostUniq.payload, &pid,sizeof (pid)); + } + conn->acName = acName; conn->serviceName = pppd_pppoe_service;strlcpy (ppp_devnam, devnam,sizeof (ppp_devnam));
pppd/plugins/rp-pppoe/pppoe-discovery.c +28 -13
71 lines not on this page · raw message
pppd/plugins/rp-pppoe/pppoe.h +29 -1
@@ -21,6 +21,8 @@#include <stdio.h> /* For FILE */ #include <sys/types.h> /* For pid_t */ +#include <ctype.h> +#include <string.h> /* How do we access raw Ethernet devices? */ #undef USE_LINUX_PACKET
@@ -236,7 +238,7 @@ typedef struct PPPoEConnectionStruct {char *serviceName;/* Desired service name, if any */ char *acName;/* Desired AC name, if any */ int synchronous;/* Use synchronous PPP */ -int useHostUniq;/* Use Host-Uniq tag */ +PPPoETag hostUniq;/* Use Host-Uniq tag */ int printACNames;/* Just print AC names */ FILE *debugFile;/* Debug file for dumping packets */ int numPADOs;/* Number of PADO packets received */
@@ -293,6 +295,32 @@ void pppoe_printpkt(PPPoEPacket *packet, void (*printer)(void *, char *, ...), void *arg);void pppoe_log_packet (const char *prefix,PPPoEPacket *packet); +static inline int parseHostUniq (const char *uniq,PPPoETag *tag) +{ +unsigned i, len =strlen (uniq); + +#define hex (x) \ + (((x) <= '9') ? ((x) - '0') : \ + (((x) <= 'F') ? ((x) - 'A' + 10) : \ + ((x) - 'a' + 10))) + +if (!len || len %2 || len /2 >sizeof (tag->payload)) +return 0 ; + +for (i =0 ; i < len; i +=2 ) { +if (!isxdigit (uniq[i]) || !isxdigit (uniq[i+1 ])) +return 0 ; + + tag->payload[i /2 ] = (char )(hex (uniq[i]) <<4 |hex (uniq[i+1 ])); + } + +#undef hex + + tag->type =htons (TAG_HOST_UNIQ ); + tag->length =htons (len /2 ); +return 1 ; +} +#define SET_STRING (var, val) do { if (var) free(var); var = strDup(val); } while(0);#define CHECK_ROOM (cursor, start, len) \
Signature · 1 line
2.19.1