X-Git-Url: https://git.ozlabs.org/?p=ppp.git;a=blobdiff_plain;f=pppd%2Fplugins%2Frp-pppoe%2Fplugin.c;h=2968e72e93c2fb8936520888f0697b49f74852ae;hp=b84a6af696d192448151ed84ac6b38fdaa929a9d;hb=427e3d851c86e35655e14f1dfa9c831a8fab94d9;hpb=24e466be1406bfedce7be9ca2dba21c9323f4e4e diff --git a/pppd/plugins/rp-pppoe/plugin.c b/pppd/plugins/rp-pppoe/plugin.c index b84a6af..2968e72 100644 --- a/pppd/plugins/rp-pppoe/plugin.c +++ b/pppd/plugins/rp-pppoe/plugin.c @@ -19,10 +19,11 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. +* ***********************************************************************/ static char const RCSID[] = -"$Id: plugin.c,v 1.15 2006/05/29 23:29:16 paulus Exp $"; +"$Id: plugin.c,v 1.16 2008/06/09 08:34:23 paulus Exp $"; #define _GNU_SOURCE 1 #include "pppoe.h" @@ -32,10 +33,9 @@ static char const RCSID[] = #include "pppd/lcp.h" #include "pppd/ipcp.h" #include "pppd/ccp.h" -#include "pppd/pathnames.h" +/* #include "pppd/pathnames.h" */ #include -#include #include #include #include @@ -48,9 +48,13 @@ static char const RCSID[] = #include #include #include -#include "ppp_defs.h" -#include "if_ppp.h" -#include "if_pppox.h" +#include +#include +#include + +#ifndef _ROOT_PATH +#define _ROOT_PATH "" +#endif #define _PATH_ETHOPT _ROOT_PATH "/etc/ppp/options." @@ -80,7 +84,7 @@ static option_t Options[] = { "Be verbose about discovered access concentrators"}, { NULL } }; - +int (*OldDevnameHook)(char *cmd, char **argv, int doit) = NULL; static PPPoEConnection *conn = NULL; /********************************************************************** @@ -97,20 +101,17 @@ PPPOEInitDevice(void) { conn = malloc(sizeof(PPPoEConnection)); if (!conn) { - fatal("Could not allocate memory for PPPoE session"); + novm("PPPoE session data"); } memset(conn, 0, sizeof(PPPoEConnection)); - if (acName) { - SET_STRING(conn->acName, acName); - } - if (pppd_pppoe_service) { - SET_STRING(conn->serviceName, pppd_pppoe_service); - } - SET_STRING(conn->ifName, devnam); + conn->acName = acName; + conn->serviceName = pppd_pppoe_service; + conn->ifName = devnam; conn->discoverySocket = -1; conn->sessionSocket = -1; conn->useHostUniq = 1; conn->printACNames = printACNames; + conn->discoveryTimeout = PADI_TIMEOUT; return 1; } @@ -155,7 +156,8 @@ PPPOEConnectDevice(void) /* Make the session socket */ conn->sessionSocket = socket(AF_PPPOX, SOCK_STREAM, PX_PROTO_OE); if (conn->sessionSocket < 0) { - fatal("Failed to create PPPoE socket: %m"); + error("Failed to create PPPoE socket: %m"); + goto errout; } sp.sa_family = AF_PPPOX; sp.sa_protocol = PX_PROTO_OE; @@ -172,13 +174,33 @@ PPPOEConnectDevice(void) (unsigned) conn->peerEth[4], (unsigned) conn->peerEth[5]); + warn("Connected to %02X:%02X:%02X:%02X:%02X:%02X via interface %s", + (unsigned) conn->peerEth[0], + (unsigned) conn->peerEth[1], + (unsigned) conn->peerEth[2], + (unsigned) conn->peerEth[3], + (unsigned) conn->peerEth[4], + (unsigned) conn->peerEth[5], + conn->ifName); + + script_setenv("MACREMOTE", remote_number, 0); + if (connect(conn->sessionSocket, (struct sockaddr *) &sp, sizeof(struct sockaddr_pppox)) < 0) { - fatal("Failed to connect PPPoE socket: %d %m", errno); - return -1; + error("Failed to connect PPPoE socket: %d %m", errno); + close(conn->sessionSocket); + goto errout; } return conn->sessionSocket; + + errout: + if (conn->discoverySocket >= 0) { + sendPADT(conn, NULL); + close(conn->discoverySocket); + conn->discoverySocket = -1; + } + return -1; } static void @@ -213,21 +235,20 @@ PPPOEDisconnectDevice(void) memcpy(sp.sa_addr.pppoe.dev, conn->ifName, IFNAMSIZ); memcpy(sp.sa_addr.pppoe.remote, conn->peerEth, ETH_ALEN); if (connect(conn->sessionSocket, (struct sockaddr *) &sp, - sizeof(struct sockaddr_pppox)) < 0) { - fatal("Failed to disconnect PPPoE socket: %d %m", errno); - return; - } + sizeof(struct sockaddr_pppox)) < 0) + error("Failed to disconnect PPPoE socket: %d %m", errno); close(conn->sessionSocket); /* don't send PADT?? */ - close(conn->discoverySocket); + if (conn->discoverySocket >= 0) + close(conn->discoverySocket); } static void PPPOEDeviceOptions(void) { char buf[256]; - snprintf(buf, 256, _PATH_ETHOPT "%s",devnam); - if(!options_from_file(buf, 0, 0, 1)) + snprintf(buf, 256, _PATH_ETHOPT "%s", devnam); + if (!options_from_file(buf, 0, 0, 1)) exit(EXIT_OPTION_ERROR); } @@ -325,60 +346,6 @@ plugin_init(void) RP_VERSION, VERSION); } -/********************************************************************** -*%FUNCTION: fatalSys -*%ARGUMENTS: -* str -- error message -*%RETURNS: -* Nothing -*%DESCRIPTION: -* Prints a message plus the errno value to stderr and syslog and exits. -***********************************************************************/ -void -fatalSys(char const *str) -{ - char buf[1024]; - int i = errno; - sprintf(buf, "%.256s: %.256s", str, strerror(i)); - printErr(buf); - sprintf(buf, "RP-PPPoE: %.256s: %.256s", str, strerror(i)); - sendPADT(conn, buf); - exit(1); -} - -/********************************************************************** -*%FUNCTION: rp_fatal -*%ARGUMENTS: -* str -- error message -*%RETURNS: -* Nothing -*%DESCRIPTION: -* Prints a message to stderr and syslog and exits. -***********************************************************************/ -void -rp_fatal(char const *str) -{ - char buf[1024]; - printErr(str); - sprintf(buf, "RP-PPPoE: %.256s", str); - sendPADT(conn, buf); - exit(1); -} -/********************************************************************** -*%FUNCTION: sysErr -*%ARGUMENTS: -* str -- error message -*%RETURNS: -* Nothing -*%DESCRIPTION: -* Prints a message plus the errno value to syslog. -***********************************************************************/ -void -sysErr(char const *str) -{ - rp_fatal(str); -} - void pppoe_check_options(void) { lcp_allowoptions[0].neg_accompression = 0; @@ -406,15 +373,15 @@ void pppoe_check_options(void) } struct channel pppoe_channel = { - options: Options, - process_extra_options: &PPPOEDeviceOptions, - check_options: pppoe_check_options, - connect: &PPPOEConnectDevice, - disconnect: &PPPOEDisconnectDevice, - establish_ppp: &generic_establish_ppp, - disestablish_ppp: &generic_disestablish_ppp, - send_config: NULL, - recv_config: &PPPOERecvConfig, - close: NULL, - cleanup: NULL + .options = Options, + .process_extra_options = &PPPOEDeviceOptions, + .check_options = pppoe_check_options, + .connect = &PPPOEConnectDevice, + .disconnect = &PPPOEDisconnectDevice, + .establish_ppp = &generic_establish_ppp, + .disestablish_ppp = &generic_disestablish_ppp, + .send_config = NULL, + .recv_config = &PPPOERecvConfig, + .close = NULL, + .cleanup = NULL };