diff options
25 files changed, 113 insertions, 1434 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 6ee52abc3..eed594361 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ppp -PKG_VERSION:=2.4.4 -PKG_RELEASE:=17 +PKG_VERSION:=2.4.5 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.samba.org/pub/ppp/ -PKG_MD5SUM:=183800762e266132218b204dfb428d29 +PKG_MD5SUM:=4621bc56167b6953ec4071043fe0ec57 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) diff --git a/package/ppp/patches/100-debian_ip-ip_option.patch b/package/ppp/patches/100-debian_ip-ip_option.patch index d7b194382..4ba12fc27 100644 --- a/package/ppp/patches/100-debian_ip-ip_option.patch +++ b/package/ppp/patches/100-debian_ip-ip_option.patch @@ -1,6 +1,6 @@ --- a/pppd/ipcp.c +++ b/pppd/ipcp.c -@@ -1850,7 +1850,7 @@ ipcp_up(f) +@@ -1939,7 +1939,7 @@ ipcp_up(f) */ if (ipcp_script_state == s_down && ipcp_script_pid == 0) { ipcp_script_state = s_up; @@ -9,7 +9,7 @@ } } -@@ -1900,7 +1900,7 @@ ipcp_down(f) +@@ -1989,7 +1989,7 @@ ipcp_down(f) /* Execute the ip-down script */ if (ipcp_script_state == s_up && ipcp_script_pid == 0) { ipcp_script_state = s_down; @@ -18,7 +18,7 @@ } } -@@ -1954,13 +1954,13 @@ ipcp_script_done(arg) +@@ -2043,13 +2043,13 @@ ipcp_script_done(arg) case s_up: if (ipcp_fsm[0].state != OPENED) { ipcp_script_state = s_down; @@ -36,7 +36,7 @@ } --- a/pppd/main.c +++ b/pppd/main.c -@@ -315,6 +315,9 @@ main(argc, argv) +@@ -316,6 +316,9 @@ main(argc, argv) struct protent *protp; char numbuf[16]; @@ -73,7 +73,7 @@ "Enable multilink operation", OPT_PRIO | 1 }, --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -312,6 +312,8 @@ extern bool tune_kernel; /* May alter ke +@@ -313,6 +313,8 @@ extern bool tune_kernel; /* May alter ke extern int connect_delay; /* Time to delay after connect script */ extern int max_data_rate; /* max bytes/sec through charshunt */ extern int req_unit; /* interface unit number to use */ diff --git a/package/ppp/patches/102-debian_fix_close_fd0.patch b/package/ppp/patches/102-debian_fix_close_fd0.patch index fb7e7bdf6..e69de29bb 100644 --- a/package/ppp/patches/102-debian_fix_close_fd0.patch +++ b/package/ppp/patches/102-debian_fix_close_fd0.patch @@ -1,19 +0,0 @@ ---- a/pppd/main.c -+++ b/pppd/main.c -@@ -1570,6 +1570,8 @@ safe_fork(int infd, int outfd, int errfd - if (errfd == 0 || errfd == 1) - errfd = dup(errfd); - -+ closelog(); -+ - /* dup the in, out, err fds to 0, 1, 2 */ - if (infd != 0) - dup2(infd, 0); -@@ -1578,7 +1580,6 @@ safe_fork(int infd, int outfd, int errfd - if (errfd != 2) - dup2(errfd, 2); - -- closelog(); - if (log_to_fd > 2) - close(log_to_fd); - if (the_channel->close) diff --git a/package/ppp/patches/103-debian_fix_link_pidfile.patch b/package/ppp/patches/103-debian_fix_link_pidfile.patch index 175573db9..b8c4aaaf6 100644 --- a/package/ppp/patches/103-debian_fix_link_pidfile.patch +++ b/package/ppp/patches/103-debian_fix_link_pidfile.patch @@ -1,6 +1,6 @@ --- a/pppd/main.c +++ b/pppd/main.c -@@ -772,8 +772,7 @@ detach() +@@ -773,8 +773,7 @@ detach() /* update pid files if they have been written already */ if (pidfilename[0]) create_pidfile(pid); diff --git a/package/ppp/patches/104-debian_fix_mschapv2_ppp.patch b/package/ppp/patches/104-debian_fix_mschapv2_ppp.patch index 0b4faf914..e69de29bb 100644 --- a/package/ppp/patches/104-debian_fix_mschapv2_ppp.patch +++ b/package/ppp/patches/104-debian_fix_mschapv2_ppp.patch @@ -1,11 +0,0 @@ ---- a/pppd/chap_ms.c -+++ b/pppd/chap_ms.c -@@ -852,7 +852,7 @@ ChapMS2(u_char *rchallenge, u_char *Peer - u_char *p = &response[MS_CHAP2_PEER_CHALLENGE]; - int i; - -- BZERO(response, sizeof(*response)); -+ BZERO(response, MS_CHAP2_RESPONSE_LEN); - - /* Generate the Peer-Challenge if requested, or copy it if supplied. */ - if (!PeerChallenge) diff --git a/package/ppp/patches/105-debian_demand.patch b/package/ppp/patches/105-debian_demand.patch index d95a26ed6..c27865698 100644 --- a/package/ppp/patches/105-debian_demand.patch +++ b/package/ppp/patches/105-debian_demand.patch @@ -139,7 +139,7 @@ } else { --- a/pppd/ipcp.c +++ b/pppd/ipcp.c -@@ -1776,7 +1776,7 @@ ipcp_up(f) +@@ -1864,7 +1864,7 @@ ipcp_up(f) proxy_arp_set[f->unit] = 1; } @@ -161,7 +161,7 @@ } else { --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -565,7 +565,7 @@ void demand_conf __P((void)); /* config +@@ -566,7 +566,7 @@ void demand_conf __P((void)); /* config void demand_block __P((void)); /* set all NPs to queue up packets */ void demand_unblock __P((void)); /* set all NPs to pass packets */ void demand_discard __P((void)); /* set all NPs to discard packets */ diff --git a/package/ppp/patches/106-debian_stripMSdomain.patch b/package/ppp/patches/106-debian_stripMSdomain.patch index 2b5e7c0ff..b65f52ec9 100644 --- a/package/ppp/patches/106-debian_stripMSdomain.patch +++ b/package/ppp/patches/106-debian_stripMSdomain.patch @@ -1,6 +1,6 @@ --- a/pppd/chap-new.c +++ b/pppd/chap-new.c -@@ -57,6 +57,7 @@ int (*chap_verify_hook)(char *name, char +@@ -58,6 +58,7 @@ int (*chap_verify_hook)(char *name, char int chap_timeout_time = 3; int chap_max_transmits = 10; int chap_rechallenge_time = 0; @@ -8,7 +8,7 @@ /* * Command-line options. -@@ -68,6 +69,8 @@ static option_t chap_option_list[] = { +@@ -69,6 +70,8 @@ static option_t chap_option_list[] = { "Set max #xmits for challenge", OPT_PRIO }, { "chap-interval", o_int, &chap_rechallenge_time, "Set interval for rechallenge", OPT_PRIO }, @@ -17,7 +17,7 @@ { NULL } }; -@@ -335,6 +338,14 @@ chap_handle_response(struct chap_server_ +@@ -336,6 +339,14 @@ chap_handle_response(struct chap_server_ /* Null terminate and clean remote name. */ slprintf(rname, sizeof(rname), "%.*v", len, name); name = rname; diff --git a/package/ppp/patches/107-debian_pppatm_cleanup.patch b/package/ppp/patches/107-debian_pppatm_cleanup.patch index 88365a1cf..a3d80a888 100644 --- a/package/ppp/patches/107-debian_pppatm_cleanup.patch +++ b/package/ppp/patches/107-debian_pppatm_cleanup.patch @@ -1,14 +1,7 @@ --- a/pppd/plugins/pppoatm/pppoatm.c +++ b/pppd/plugins/pppoatm/pppoatm.c -@@ -70,18 +70,20 @@ static int setdevname_pppoatm(const char - { - struct sockaddr_atmpvc addr; - extern struct stat devstat; -+ - if (device_got_set) - return 0; -- //info("PPPoATM setdevname_pppoatm: '%s'", cp); -+ +@@ -75,13 +75,14 @@ static int setdevname_pppoatm(const char + //info("PPPoATM setdevname_pppoatm: '%s'", cp); memset(&addr, 0, sizeof addr); if (text2atm(cp, (struct sockaddr *) &addr, sizeof(addr), - T2A_PVC | T2A_NAME) < 0) { @@ -28,52 +21,7 @@ memcpy(&pvcaddr, &addr, sizeof pvcaddr); strlcpy(devnam, cp, sizeof devnam); devstat.st_mode = S_IFSOCK; -@@ -93,7 +95,6 @@ static int setdevname_pppoatm(const char - lcp_allowoptions[0].neg_asyncmap = 0; - lcp_wantoptions[0].neg_pcompression = 0; - } -- info("PPPoATM setdevname_pppoatm - SUCCESS:%s", cp); - device_got_set = 1; - return 1; - } -@@ -108,6 +109,7 @@ static void no_device_given_pppoatm(void - static void set_line_discipline_pppoatm(int fd) - { - struct atm_backend_ppp be; -+ - be.backend_num = ATM_BACKEND_PPP; - if (!llc_encaps) - be.encaps = PPPOATM_ENCAPS_VC; -@@ -115,6 +117,7 @@ static void set_line_discipline_pppoatm( - be.encaps = PPPOATM_ENCAPS_LLC; - else - be.encaps = PPPOATM_ENCAPS_AUTODETECT; -+ - if (ioctl(fd, ATM_SETBACKEND, &be) < 0) - fatal("ioctl(ATM_SETBACKEND): %m"); - } -@@ -175,16 +178,19 @@ static void send_config_pppoa(int mtu, - { - int sock; - struct ifreq ifr; -+ - if (mtu > pppoatm_max_mtu) - error("Couldn't increase MTU to %d", mtu); -+ - sock = socket(AF_INET, SOCK_DGRAM, 0); - if (sock < 0) - fatal("Couldn't create IP socket: %m"); -+ - strlcpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - ifr.ifr_mtu = mtu; - if (ioctl(sock, SIOCSIFMTU, (caddr_t) &ifr) < 0) - fatal("ioctl(SIOCSIFMTU): %m"); -- (void) close (sock); -+ close(sock); - } - - static void recv_config_pppoa(int mru, -@@ -198,7 +204,7 @@ static void recv_config_pppoa(int mru, +@@ -170,7 +171,7 @@ static void disconnect_pppoatm(void) void plugin_init(void) { @@ -82,14 +30,3 @@ extern int new_style_driver; /* From sys-linux.c */ if (!ppp_available() && !new_style_driver) fatal("Kernel doesn't support ppp_generic - " -@@ -206,9 +212,9 @@ void plugin_init(void) - #else - fatal("No PPPoATM support on this OS"); - #endif -- info("PPPoATM plugin_init"); - add_options(pppoa_options); - } -+ - struct channel pppoa_channel = { - options: pppoa_options, - process_extra_options: NULL, diff --git a/package/ppp/patches/108-debian_pppatm_fix_mtu.patch b/package/ppp/patches/108-debian_pppatm_fix_mtu.patch index d8f17eff0..e69de29bb 100644 --- a/package/ppp/patches/108-debian_pppatm_fix_mtu.patch +++ b/package/ppp/patches/108-debian_pppatm_fix_mtu.patch @@ -1,30 +0,0 @@ ---- a/pppd/plugins/pppoatm/pppoatm.c -+++ b/pppd/plugins/pppoatm/pppoatm.c -@@ -179,8 +179,11 @@ static void send_config_pppoa(int mtu, - int sock; - struct ifreq ifr; - -- if (mtu > pppoatm_max_mtu) -- error("Couldn't increase MTU to %d", mtu); -+ if (pppoatm_max_mtu && mtu > pppoatm_max_mtu) { -+ warn("Couldn't increase MTU to %d. Using %d", -+ mtu, pppoatm_max_mtu); -+ mtu = pppoatm_max_mtu; -+ } - - sock = socket(AF_INET, SOCK_DGRAM, 0); - if (sock < 0) -@@ -198,8 +201,11 @@ static void recv_config_pppoa(int mru, - int pcomp, - int accomp) - { -- if (mru > pppoatm_max_mru) -- error("Couldn't increase MRU to %d", mru); -+ if (pppoatm_max_mru && mru > pppoatm_max_mru) { -+ warn("Couldn't increase MRU to %d. Using %d", -+ mru, pppoatm_max_mru); -+ mru = pppoatm_max_mru; -+ } - } - - void plugin_init(void) diff --git a/package/ppp/patches/109-debian_pppoe_cleanup.patch b/package/ppp/patches/109-debian_pppoe_cleanup.patch index dfea59a7a..e69de29bb 100644 --- a/package/ppp/patches/109-debian_pppoe_cleanup.patch +++ b/package/ppp/patches/109-debian_pppoe_cleanup.patch @@ -1,1071 +0,0 @@ ---- a/pppd/plugins/rp-pppoe/common.c -+++ b/pppd/plugins/rp-pppoe/common.c -@@ -18,10 +18,6 @@ static char const RCSID[] = - - #include "pppoe.h" - --#ifdef HAVE_SYSLOG_H --#include <syslog.h> --#endif -- - #include <string.h> - #include <errno.h> - #include <stdlib.h> -@@ -50,17 +46,17 @@ parsePacket(PPPoEPacket *packet, ParseFu - UINT16_t tagType, tagLen; - - if (packet->ver != 1) { -- syslog(LOG_ERR, "Invalid PPPoE version (%d)", (int) packet->ver); -+ error("Invalid PPPoE version (%u)", packet->ver); - return -1; - } - if (packet->type != 1) { -- syslog(LOG_ERR, "Invalid PPPoE type (%d)", (int) packet->type); -+ error("Invalid PPPoE type (%u)", packet->type); - return -1; - } - - /* Do some sanity checks on packet */ - if (len > ETH_DATA_LEN - 6) { /* 6-byte overhead for PPPoE header */ -- syslog(LOG_ERR, "Invalid PPPoE packet length (%u)", len); -+ error("Invalid PPPoE packet length (%u)", len); - return -1; - } - -@@ -76,7 +72,7 @@ parsePacket(PPPoEPacket *packet, ParseFu - return 0; - } - if ((curTag - packet->payload) + tagLen + TAG_HDR_SIZE > len) { -- syslog(LOG_ERR, "Invalid PPPoE tag length (%u)", tagLen); -+ error("Invalid PPPoE tag length (%u)", tagLen); - return -1; - } - func(tagType, tagLen, curTag+TAG_HDR_SIZE, extra); -@@ -105,17 +101,17 @@ findTag(PPPoEPacket *packet, UINT16_t ty - UINT16_t tagType, tagLen; - - if (packet->ver != 1) { -- syslog(LOG_ERR, "Invalid PPPoE version (%d)", (int) packet->ver); -+ error("Invalid PPPoE version (%u)", packet->ver); - return NULL; - } - if (packet->type != 1) { -- syslog(LOG_ERR, "Invalid PPPoE type (%d)", (int) packet->type); -+ error("Invalid PPPoE type (%u)", packet->type); - return NULL; - } - - /* Do some sanity checks on packet */ - if (len > ETH_DATA_LEN - 6) { /* 6-byte overhead for PPPoE header */ -- syslog(LOG_ERR, "Invalid PPPoE packet length (%u)", len); -+ error("Invalid PPPoE packet length (%u)", len); - return NULL; - } - -@@ -131,7 +127,7 @@ findTag(PPPoEPacket *packet, UINT16_t ty - return NULL; - } - if ((curTag - packet->payload) + tagLen + TAG_HDR_SIZE > len) { -- syslog(LOG_ERR, "Invalid PPPoE tag length (%u)", tagLen); -+ error("Invalid PPPoE tag length (%u)", tagLen); - return NULL; - } - if (tagType == type) { -@@ -143,6 +139,7 @@ findTag(PPPoEPacket *packet, UINT16_t ty - return NULL; - } - -+#ifdef unused - /********************************************************************** - *%FUNCTION: printErr - *%ARGUMENTS: -@@ -158,6 +155,7 @@ printErr(char const *str) - fprintf(stderr, "pppoe: %s\n", str); - syslog(LOG_ERR, "%s", str); - } -+#endif - - - /********************************************************************** -@@ -172,7 +170,7 @@ strDup(char const *str) - { - char *copy = malloc(strlen(str)+1); - if (!copy) { -- rp_fatal("strdup failed"); -+ fatal("strdup failed"); - } - strcpy(copy, str); - return copy; -@@ -467,9 +465,10 @@ sendPADT(PPPoEConnection *conn, char con - fprintf(conn->debugFile, "\n"); - fflush(conn->debugFile); - } -- syslog(LOG_INFO,"Sent PADT"); -+ info("Sent PADT"); - } - -+#ifdef unused - /********************************************************************** - *%FUNCTION: parseLogErrs - *%ARGUMENTS: -@@ -501,4 +500,5 @@ parseLogErrs(UINT16_t type, UINT16_t len - break; - } - } -+#endif - ---- a/pppd/plugins/rp-pppoe/discovery.c -+++ b/pppd/plugins/rp-pppoe/discovery.c -@@ -13,10 +13,6 @@ static char const RCSID[] = - - #include "pppoe.h" - --#ifdef HAVE_SYSLOG_H --#include <syslog.h> --#endif -- - #include <string.h> - #include <stdlib.h> - #include <errno.h> -@@ -167,24 +163,21 @@ parsePADOTags(UINT16_t type, UINT16_t le - if (conn->printACNames) { - printf("Got a Service-Name-Error tag: %.*s\n", (int) len, data); - } else { -- syslog(LOG_ERR, "PADO: Service-Name-Error: %.*s", (int) len, data); -- exit(1); -+ fatal("PADO: Service-Name-Error: %.*s", (int) len, data); - } - break; - case TAG_AC_SYSTEM_ERROR: - if (conn->printACNames) { - printf("Got a System-Error tag: %.*s\n", (int) len, data); - } else { -- syslog(LOG_ERR, "PADO: System-Error: %.*s", (int) len, data); -- exit(1); -+ fatal("PADO: System-Error: %.*s", (int) len, data); - } - break; - case TAG_GENERIC_ERROR: - if (conn->printACNames) { - printf("Got a Generic-Error tag: %.*s\n", (int) len, data); - } else { -- syslog(LOG_ERR, "PADO: Generic-Error: %.*s", (int) len, data); -- exit(1); -+ fatal("PADO: Generic-Error: %.*s", (int) len, data); - } - break; - } -@@ -209,20 +202,14 @@ parsePADSTags(UINT16_t type, UINT16_t le - PPPoEConnection *conn = (PPPoEConnection *) extra; - switch(type) { - case TAG_SERVICE_NAME: -- syslog(LOG_DEBUG, "PADS: Service-Name: '%.*s'", (int) len, data); -+ dbglog("PADS: Service-Name: '%.*s'", (int) len, data); - break; - case TAG_SERVICE_NAME_ERROR: -- syslog(LOG_ERR, "PADS: Service-Name-Error: %.*s", (int) len, data); -- fprintf(stderr, "PADS: Service-Name-Error: %.*s\n", (int) len, data); -- exit(1); -+ fatal("PADS: Service-Name-Error: %.*s", (int) len, data); - case TAG_AC_SYSTEM_ERROR: -- syslog(LOG_ERR, "PADS: System-Error: %.*s", (int) len, data); -- fprintf(stderr, "PADS: System-Error: %.*s\n", (int) len, data); -- exit(1); -+ fatal("PADS: System-Error: %.*s", (int) len, data); - case TAG_GENERIC_ERROR: -- syslog(LOG_ERR, "PADS: Generic-Error: %.*s", (int) len, data); -- fprintf(stderr, "PADS: Generic-Error: %.*s\n", (int) len, data); -- exit(1); -+ fatal("PADS: Generic-Error: %.*s", (int) len, data); - case TAG_RELAY_SESSION_ID: - conn->relayId.type = htons(type); - conn->relayId.length = htons(len); -@@ -336,7 +323,7 @@ waitForPADO(PPPoEConnection *conn, int t - if (r >= 0 || errno != EINTR) break; - } - if (r < 0) { -- fatalSys("select (waitForPADO)"); -+ fatal("waitForPADO: select: %m"); - } - if (r == 0) return; /* Timed out */ - } -@@ -346,8 +333,7 @@ waitForPADO(PPPoEConnection *conn, int t - - /* Check length */ - if (ntohs(packet.length) + HDR_SIZE > len) { -- syslog(LOG_ERR, "Bogus PPPoE length field (%u)", -- (unsigned int) ntohs(packet.length)); -+ error("Bogus PPPoE length field (%u)", ntohs(packet.length)); - continue; - } - -@@ -366,16 +352,16 @@ waitForPADO(PPPoEConnection *conn, int t - - if (packet.code == CODE_PADO) { - if (BROADCAST(packet.ethHdr.h_source)) { -- printErr("Ignoring PADO packet from broadcast MAC address"); -+ error("Ignoring PADO packet from broadcast MAC address"); - continue; - } - parsePacket(&packet, parsePADOTags, &pc); - if (!pc.seenACName) { -- printErr("Ignoring PADO packet with no AC-Name tag"); -+ error("Ignoring PADO packet with no AC-Name tag"); - continue; - } - if (!pc.seenServiceName) { -- printErr("Ignoring PADO packet with no Service-Name tag"); -+ error("Ignoring PADO packet with no Service-Name tag"); - continue; - } - conn->numPADOs++; -@@ -513,7 +499,7 @@ waitForPADS(PPPoEConnection *conn, int t - if (r >= 0 || errno != EINTR) break; - } - if (r < 0) { -- fatalSys("select (waitForPADS)"); -+ fatal("waitForPADS: select: %m"); - } - if (r == 0) return; - } -@@ -523,8 +509,7 @@ waitForPADS(PPPoEConnection *conn, int t - - /* Check length */ - if (ntohs(packet.length) + HDR_SIZE > len) { -- syslog(LOG_ERR, "Bogus PPPoE length field (%u)", -- (unsigned int) ntohs(packet.length)); -+ error("Bogus PPPoE length field (%u)", ntohs(packet.length)); - continue; - } - -@@ -556,11 +541,12 @@ waitForPADS(PPPoEConnection *conn, int t - /* Don't bother with ntohs; we'll just end up converting it back... */ - conn->session = packet.session; - -- syslog(LOG_INFO, "PPP session is %d", (int) ntohs(conn->session)); -+ info("PPP session is %d", ntohs(conn->session)); - - /* RFC 2516 says session id MUST NOT be zero or 0xFFFF */ - if (ntohs(conn->session) == 0 || ntohs(conn->session) == 0xFFFF) { -- syslog(LOG_ERR, "Access concentrator used a session value of %x -- the AC is violating RFC 2516", (unsigned int) ntohs(conn->session)); -+ error("Access concentrator used a session value of 0x%x" -+ " -- the AC is violating RFC 2516", ntohs(conn->session)); - } - } - -@@ -620,7 +606,7 @@ discovery(PPPoEConnection *conn) - - /* If we're only printing access concentrator names, we're done */ - if (conn->printACNames) { -- die(0); -+ exit(0); - } - - timeout = PADI_TIMEOUT; ---- a/pppd/plugins/rp-pppoe/if.c -+++ b/pppd/plugins/rp-pppoe/if.c -@@ -40,10 +40,6 @@ static char const RCSID[] = - #include <sys/ioctl.h> - #endif - --#ifdef HAVE_SYSLOG_H --#include <syslog.h> --#endif -- - #include <errno.h> - #include <stdlib.h> - #include <string.h> -@@ -127,7 +123,7 @@ etherType(PPPoEPacket *packet) - { - UINT16_t type = (UINT16_t) ntohs(packet->ethHdr.h_proto); - if (type != Eth_PPPOE_Discovery && type != Eth_PPPOE_Session) { -- syslog(LOG_ERR, "Invalid ether type 0x%x", type); -+ error("Invalid ethernet type 0x%x", type); - } - return type; - } -@@ -156,7 +152,7 @@ getHWaddr(int sock, char const *ifname, - ifc.ifc_len = sizeof(inbuf); - ifc.ifc_buf = inbuf; - if (ioctl(sock, SIOCGIFCONF, &ifc) < 0) { -- fatalSys("SIOCGIFCONF"); -+ fatal("SIOCGIFCONF: %m"); - } - ifr = ifc.ifc_req; - ifreq.ifr_name[0] = '\0'; -@@ -172,9 +168,7 @@ getHWaddr(int sock, char const *ifname, - (sdl->sdl_alen == ETH_ALEN) && - !strncmp(ifname, ifr->ifr_name, sizeof(ifr->ifr_name))) { - if (found) { -- char buffer[256]; -- sprintf(buffer, "interface %.16s has more than one ethernet address", ifname); -- rp_fatal(buffer); -+ fatal("interface %s has more than one ethernet address", ifname); - } else { - found = 1; - memcpy(hwaddr, LLADDR(sdl), ETH_ALEN); -@@ -183,9 +177,7 @@ getHWaddr(int sock, char const *ifname, - } - } - if (!found) { -- char buffer[256]; -- sprintf(buffer, "interface %.16s has no ethernet address", ifname); -- rp_fatal(buffer); -+ fatal("interface %s has no ethernet address", ifname); - } - } - -@@ -252,7 +244,7 @@ initFilter(int fd, UINT16_t type, unsign - - /* Apply the filter */ - if (ioctl(fd, BIOCSETF, &bpfProgram) < 0) { -- fatalSys("ioctl(BIOCSETF)"); -+ fatal("ioctl(BIOCSETF): %m"); - } - } - } -@@ -298,42 +290,36 @@ openInterface(char const *ifname, UINT16 - if (fd < 0) { - switch (errno) { - case EACCES: /* permission denied */ -- { -- char buffer[256]; -- sprintf(buffer, "Cannot open %.32s -- pppoe must be run as root.", bpfName); -- rp_fatal(buffer); -- } -+ fatal("Cannot open %s -- pppoe must be run as root.", bpfName); - break; - case EBUSY: - case ENOENT: /* no such file */ - if (i == 0) { -- rp_fatal("No /dev/bpf* devices (check your kernel configuration for BPF support)"); -+ fatal("No /dev/bpf* devices (check your kernel configuration for BPF support)"); - } else { -- rp_fatal("All /dev/bpf* devices are in use"); -+ fatal("All /dev/bpf* devices are in use"); - } - break; - } -- fatalSys(bpfName); -+ fatal("%s: %m", bpfName); - } - - if ((sock = socket(AF_LOCAL, SOCK_DGRAM, 0)) < 0) { -- fatalSys("socket"); -+ fatal("socket: %m"); - } - - /* Check that the interface is up */ - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) { -- fatalSys("ioctl(SIOCGIFFLAGS)"); -+ fatal("ioctl(SIOCGIFFLAGS): %m"); - } - if ((ifr.ifr_flags & IFF_UP) == 0) { -- char buffer[256]; -- sprintf(buffer, "Interface %.16s is not up\n", ifname); -- rp_fatal(buffer); -+ fatal("Interface %s is not up", ifname); - } - - /* Fill in hardware address and initialize the packet filter rules */ - if (hwaddr == NULL) { -- rp_fatal("openInterface: no hwaddr arg."); -+ fatal("openInterface: no hwaddr arg."); - } - getHWaddr(sock, ifname, hwaddr); - initFilter(fd, type, hwaddr); -@@ -342,58 +328,52 @@ openInterface(char const *ifname, UINT16 - #if !defined(__OpenBSD__) - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(sock, SIOCGIFMTU, &ifr) < 0) { -- fatalSys("ioctl(SIOCGIFMTU)"); -+ fatal("ioctl(SIOCGIFMTU): %m"); - } - if (ifr.ifr_mtu < ETH_DATA_LEN) { -- char buffer[256]; -- sprintf(buffer, "Interface %.16s has MTU of %d -- should be %d. You may have serious connection problems.", -+ error("Interface %s has MTU of %d -- should be %d." -+ " You may have serious connection problems.", - ifname, ifr.ifr_mtu, ETH_DATA_LEN); -- printErr(buffer); - } - #endif - - /* done with the socket */ - if (close(sock) < 0) { -- fatalSys("close"); -+ fatal("close: %m"); - } - - /* Check the BPF version number */ - if (ioctl(fd, BIOCVERSION, &bpf_ver) < 0) { -- fatalSys("ioctl(BIOCVERSION)"); -+ fatal("ioctl(BIOCVERSION): %m"); - } - if ((bpf_ver.bv_major != BPF_MAJOR_VERSION) || - (bpf_ver.bv_minor < BPF_MINOR_VERSION)) { -- char buffer[256]; -- sprintf(buffer, "Unsupported BPF version: %d.%d (kernel: %d.%d)", -+ fatal("Unsupported BPF version: %d.%d (kernel: %d.%d)", - BPF_MAJOR_VERSION, BPF_MINOR_VERSION, - bpf_ver.bv_major, bpf_ver.bv_minor); -- rp_fatal(buffer); - } - - /* allocate a receive packet buffer */ - if (ioctl(fd, BIOCGBLEN, &bpfLength) < 0) { -- fatalSys("ioctl(BIOCGBLEN)"); -+ fatal("ioctl(BIOCGBLEN): %m"); - } - if (!(bpfBuffer = (unsigned char *) malloc(bpfLength))) { -- rp_fatal("malloc"); -+ fatal("malloc"); - } - - /* reads should return as soon as there is a packet available */ - optval = 1; - if (ioctl(fd, BIOCIMMEDIATE, &optval) < 0) { -- fatalSys("ioctl(BIOCIMMEDIATE)"); -+ fatal("ioctl(BIOCIMMEDIATE): %m"); - } - - /* Bind the interface to the filter */ - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(fd, BIOCSETIF, &ifr) < 0) { -- char buffer[256]; -- sprintf(buffer, "ioctl(BIOCSETIF) can't select interface %.16s", -- ifname); -- rp_fatal(buffer); -+ fatal("ioctl(BIOCSETIF) can't select interface %s: %m", ifname); - } - -- syslog(LOG_INFO, "Interface=%.16s HWaddr=%02X:%02X:%02X:%02X:%02X:%02X Device=%.32s Buffer size=%d", -+ info("Interface=%s HWaddr=%02X:%02X:%02X:%02X:%02X:%02X Device=%s Buffer size=%d", - ifname, - hwaddr[0], hwaddr[1], hwaddr[2], - hwaddr[3], hwaddr[4], hwaddr[5], -@@ -442,48 +422,41 @@ openInterface(char const *ifname, UINT16 - if ((fd = socket(domain, stype, htons(type))) < 0) { - /* Give a more helpful message for the common error case */ - if (errno == EPERM) { -- rp_fatal("Cannot create raw socket -- pppoe must be run as root."); -+ fatal("Cannot create raw socket -- pppoe must be run as root."); - } -- fatalSys("socket"); -+ fatal("cannot create the raw socket: %m"); - } - - if (setsockopt(fd, SOL_SOCKET, SO_BROADCAST, &optval, sizeof(optval)) < 0) { -- fatalSys("setsockopt"); -+ fatal("setsockopt(SOL_SOCKET, SO_BROADCAST): %m"); - } - - /* Fill in hardware address */ - if (hwaddr) { - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); -- if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) { -- fatalSys("ioctl(SIOCGIFHWADDR)"); -- } -+ if (ioctl(fd, SIOCGIFHWADDR, &ifr) < 0) -+ fatal("ioctl(SIOCGIFHWADDR): %m"); - memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, ETH_ALEN); - #ifdef ARPHRD_ETHER - if (ifr.ifr_hwaddr.sa_family != ARPHRD_ETHER) { -- char buffer[256]; -- sprintf(buffer, "Interface %.16s is not Ethernet", ifname); -- rp_fatal(buffer); -+ fatal("Interface %s is not Ethernet", ifname); - } - #endif - if (NOT_UNICAST(hwaddr)) { -- char buffer[256]; -- sprintf(buffer, -- "Interface %.16s has broadcast/multicast MAC address??", -+ fatal("Interface %s has broadcast/multicast MAC address", - ifname); -- rp_fatal(buffer); - } - } - - /* Sanity check on MTU */ - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(fd, SIOCGIFMTU, &ifr) < 0) { -- fatalSys("ioctl(SIOCGIFMTU)"); -+ fatal("ioctl(SIOCGIFMTU): %m"); - } - if (ifr.ifr_mtu < ETH_DATA_LEN) { -- char buffer[256]; -- sprintf(buffer, "Interface %.16s has MTU of %d -- should be %d. You may have serious connection problems.", -+ error("Interface %s has MTU of %d -- should be %d." -+ " You may have serious connection problems.", - ifname, ifr.ifr_mtu, ETH_DATA_LEN); -- printErr(buffer); - } - - #ifdef HAVE_STRUCT_SOCKADDR_LL -@@ -493,7 +466,7 @@ openInterface(char const *ifname, UINT16 - - strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name)); - if (ioctl(fd, SIOCGIFINDEX, &ifr) < 0) { -- fatalSys("ioctl(SIOCFIGINDEX): Could not get interface index"); -+ fatal("ioctl(SIOCFIGINDEX): Could not get interface index: %m"); - } - sa.sll_ifindex = ifr.ifr_ifindex; - -@@ -503,7 +476,7 @@ openInterface(char const *ifname, UINT16 - - /* We're only interested in packets on specified interface */ - if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) { -- fatalSys("bind"); -+ fatal("bind: %m"); - } - - return fd; -@@ -527,13 +500,11 @@ sendPacket(PPPoEConnection *conn, int so - { - #if defined(USE_BPF) - if (write(sock, pkt, size) < 0) { -- sysErr("write (sendPacket)"); -- return -1; -+ fatal("sendPacket: write: %m"); - } - #elif defined(HAVE_STRUCT_SOCKADDR_LL) - if (send(sock, pkt, size, 0) < 0) { -- sysErr("send (sendPacket)"); -- return -1; -+ fatal("sendPacket: send: %m"); - } - #else - #ifdef USE_DLPI -@@ -577,12 +548,11 @@ sendPacket(PPPoEConnection *conn, int so - struct sockaddr sa; - - if (!conn) { -- rp_fatal("relay and server not supported on Linux 2.0 kernels"); -+ fatal("relay and server not supported on Linux 2.0 kernels"); - } - strcpy(sa.sa_data, conn->ifName); - if (sendto(sock, pkt, size, 0, &sa, sizeof(sa)) < 0) { -- sysErr("sendto (sendPacket)"); -- return -1; -+ fatal("sendPacket: sendto: %m"); - } - #endif - #endif -@@ -632,26 +602,24 @@ receivePacket(int sock, PPPoEPacket *pkt - if (bpfSize <= 0) { - bpfOffset = 0; - if ((bpfSize = read(sock, bpfBuffer, bpfLength)) < 0) { -- sysErr("read (receivePacket)"); -- return -1; -+ fatal("receivePacket: read: %m"); - } - } - if (bpfSize < sizeof(hdr)) { -- syslog(LOG_ERR, "Truncated bpf packet header: len=%d", bpfSize); -+ error("Truncated bpf packet header: len=%d", bpfSize); - clearPacketHeader(pkt); /* resets bpfSize and bpfOffset */ - return 0; - } - memcpy(&hdr, bpfBuffer + bpfOffset, sizeof(hdr)); - if (hdr.bh_caplen != hdr.bh_datalen) { -- syslog(LOG_ERR, "Truncated bpf packet: caplen=%d, datalen=%d", -+ error("Truncated bpf packet: caplen=%d, datalen=%d", - hdr.bh_caplen, hdr.bh_datalen); - clearPacketHeader(pkt); /* resets bpfSize and bpfOffset */ - return 0; - } - seglen = hdr.bh_hdrlen + hdr.bh_caplen; - if (seglen > bpfSize) { -- syslog(LOG_ERR, "Truncated bpf packet: seglen=%d, bpfSize=%d", -- seglen, bpfSize); -+ error("Truncated bpf packet: seglen=%d, bpfSize=%d", seglen, bpfSize); - clearPacketHeader(pkt); /* resets bpfSize and bpfOffset */ - return 0; - } -@@ -676,16 +644,14 @@ receivePacket(int sock, PPPoEPacket *pkt - data.len = 0; - - if ((retval = getmsg(sock, NULL, &data, &flags)) < 0) { -- sysErr("read (receivePacket)"); -- return -1; -+ fatal("receivePacket: getmsg: %m"); - } - - *size = data.len; - - #else - if ((*size = recv(sock, pkt, sizeof(PPPoEPacket), 0)) < 0) { -- sysErr("recv (receivePacket)"); -- return -1; -+ fatal("receivePacket: recv: %m"); - } - #endif - #endif -@@ -716,7 +682,7 @@ openInterface(char const *ifname, UINT16 - int ppa; - - if(strlen(ifname) > PATH_MAX) { -- rp_fatal("socket: string to long"); -+ fatal("openInterface: interface name too long"); - } - - ppa = atoi(&ifname[strlen(ifname)-1]); -@@ -729,9 +695,9 @@ openInterface(char const *ifname, UINT16 - if (( fd = open(base_dev, O_RDWR)) < 0) { - /* Give a more helpful message for the common error case */ - if (errno == EPERM) { -- rp_fatal("Cannot create raw socket -- pppoe must be run as root."); -+ fatal("Cannot create raw socket -- pppoe must be run as root."); - } -- fatalSys("socket"); -+ fatal("open(%s): %m", base_dev); - } - - /* rearranged order of DLPI code - delphys 20010803 */ -@@ -747,17 +713,18 @@ openInterface(char const *ifname, UINT16 - dl_abssaplen = ABS(dlp->info_ack.dl_sap_length); - dl_saplen = dlp->info_ack.dl_sap_length; - if (ETHERADDRL != (dlp->info_ack.dl_addr_length - dl_abssaplen)) -- fatalSys("invalid destination physical address length"); -+ fatal("invalid destination physical address length"); - dl_addrlen = dl_abssaplen + ETHERADDRL; - - /* ethernet address retrieved as part of DL_INFO_ACK - delphys 20010803 */ - memcpy(hwaddr, (u_char*)((char*)(dlp) + (int)(dlp->info_ack.dl_addr_offset)), ETHERADDRL); - - if ( strioctl(fd, DLIOCRAW, -1, 0, NULL) < 0 ) { -- fatalSys("DLIOCRAW"); -+ fatal("DLIOCRAW: %m"); - } - -- if (ioctl(fd, I_FLUSH, FLUSHR) < 0) fatalSys("I_FLUSH"); -+ if (ioctl(fd, I_FLUSH, FLUSHR) < 0) -+ fatal("I_FLUSH: %m"); - - return fd; - } -@@ -780,7 +747,7 @@ void dlpromisconreq(int fd, u_long level - flags = 0; - - if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0) -- fatalSys("dlpromiscon: putmsg"); -+ fatal("dlpromiscon: putmsg: %m"); - - } - -@@ -799,7 +766,7 @@ void dlinforeq(int fd) - flags = RS_HIPRI; - - if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0) -- fatalSys("dlinforeq: putmsg"); -+ fatal("dlinforeq: putmsg: %m"); - } - - void dlunitdatareq(int fd, u_char *addrp, int addrlen, u_long minpri, u_long maxpri, u_char *datap, int datalen) -@@ -827,7 +794,7 @@ void dlunitdatareq(int fd, u_char *addrp - data.buf = (char *) datap; - - if (putmsg(fd, &ctl, &data, 0) < 0) -- fatalSys("dlunitdatareq: putmsg"); -+ fatal("dlunitdatareq: putmsg: %m"); - } - - void dlinfoack(int fd, char *bufp) -@@ -847,18 +814,14 @@ void dlinfoack(int fd, char *bufp) - expecting(DL_INFO_ACK, dlp); - - if (ctl.len < sizeof (dl_info_ack_t)) { -- char buffer[256]; -- sprintf(buffer, "dlinfoack: response ctl.len too short: %d", ctl.len); -- rp_fatal(buffer); -+ fatal("dlinfoack: response ctl.len too short: %d", ctl.len); - } - - if (flags != RS_HIPRI) -- rp_fatal("dlinfoack: DL_INFO_ACK was not M_PCPROTO"); -+ fatal("dlinfoack: DL_INFO_ACK was not M_PCPROTO"); - - if (ctl.len < sizeof (dl_info_ack_t)) { -- char buffer[256]; -- sprintf(buffer, "dlinfoack: short response ctl.len: %d", ctl.len); -- rp_fatal(buffer); -+ fatal("dlinfoack: short response ctl.len: %d", ctl.len); - } - } - -@@ -882,7 +845,7 @@ void dlbindreq(int fd, u_long sap, u_lon - flags = 0; - - if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0) -- fatalSys("dlbindreq: putmsg"); -+ fatal("dlbindreq: putmsg: %m"); - } - - void dlattachreq(int fd, u_long ppa) -@@ -901,7 +864,7 @@ void dlattachreq(int fd, u_long ppa) - flags = 0; - - if (putmsg(fd, &ctl, (struct strbuf*) NULL, flags) < 0) -- fatalSys("dlattachreq: putmsg"); -+ fatal("dlattachreq: putmsg: %m"); - } - - void dlokack(int fd, char *bufp) -@@ -921,18 +884,14 @@ void dlokack(int fd, char *bufp) - expecting(DL_OK_ACK, dlp); - - if (ctl.len < sizeof (dl_ok_ack_t)) { -- char buffer[256]; -- sprintf(buffer, "dlokack: response ctl.len too short: %d", ctl.len); -- rp_fatal(buffer); -+ fatal("dlokack: response ctl.len too short: %d", ctl.len); - } - - if (flags != RS_HIPRI) -- rp_fatal("dlokack: DL_OK_ACK was not M_PCPROTO"); -+ fatal("dlokack: DL_OK_ACK was not M_PCPROTO"); - - if (ctl.len < sizeof (dl_ok_ack_t)) { -- char buffer[256]; -- sprintf(buffer, "dlokack: short response ctl.len: %d", ctl.len); -- rp_fatal(buffer); -+ fatal("dlokack: short response ctl.len: %d", ctl.len); - } - } - -@@ -953,12 +912,10 @@ void dlbindack(int fd, char *bufp) - expecting(DL_BIND_ACK, dlp); - - if (flags != RS_HIPRI) -- rp_fatal("dlbindack: DL_OK_ACK was not M_PCPROTO"); -+ fatal("dlbindack: DL_OK_ACK was not M_PCPROTO"); - - if (ctl.len < sizeof (dl_bind_ack_t)) { -- char buffer[256]; -- sprintf(buffer, "dlbindack: short response ctl.len: %d", ctl.len); -- rp_fatal(buffer); -+ fatal("dlbindack: short response ctl.len: %d", ctl.len); - } - } - -@@ -989,8 +946,7 @@ void strgetmsg(int fd, struct strbuf *ct - */ - (void) signal(SIGALRM, sigalrm); - if (alarm(MAXWAIT) < 0) { -- (void) sprintf(errmsg, "%s: alarm", caller); -- fatalSys(errmsg); -+ fatal("%s: alarm", caller); - } - - /* -@@ -998,61 +954,48 @@ void strgetmsg(int fd, struct strbuf *ct - */ - *flagsp = 0; - if ((rc = getmsg(fd, ctlp, datap, flagsp)) < 0) { -- (void) sprintf(errmsg, "%s: getmsg", caller); -- fatalSys(errmsg); -+ fatal(errmsg, "%s: getmsg: %m", caller); - } - - /* - * Stop timer. - */ - if (alarm(0) < 0) { -- (void) sprintf(errmsg, "%s: alarm", caller); -- fatalSys(errmsg); -+ fatal("%s: alarm", caller); - } - - /* - * Check for MOREDATA and/or MORECTL. - */ - if ((rc & (MORECTL | MOREDATA)) == (MORECTL | MOREDATA)) { -- char buffer[256]; -- sprintf(buffer, "%s: MORECTL|MOREDATA", caller); -- rp_fatal(buffer); -+ fatal("%s: MORECTL|MOREDATA", caller); - } - - if (rc & MORECTL) { -- char buffer[256]; -- sprintf(buffer, "%s: MORECTL", caller); -- rp_fatal(buffer); -+ fatal("%s: MORECTL", caller); - } - - if (rc & MOREDATA) { -- char buffer[256]; -- sprintf(buffer, "%s: MOREDATA", caller); -- rp_fatal(buffer); -+ fatal("%s: MOREDATA", caller); - } - - /* - * Check for at least sizeof (long) control data portion. - */ - if (ctlp->len < sizeof (long)) { -- char buffer[256]; -- sprintf(buffer, "getmsg: control portion length < sizeof (long): %d", ctlp->len); -- rp_fatal(buffer); -+ fatal("getmsg: control portion length < sizeof (long): %d", ctlp->len); - } - } - - void sigalrm(int sig) - { -- (void) rp_fatal("sigalrm: TIMEOUT"); -+ fatal("sigalrm: TIMEOUT"); - } - - void expecting(int prim, union DL_primitives *dlp) - { - if (dlp->dl_primitive != (u_long)prim) { -- char buffer[256]; -- sprintf(buffer, "expected %s got %s", dlprim(prim), dlprim(dlp->dl_primitive)); -- rp_fatal(buffer); -- exit(1); -+ fatal("expected %s got %s", dlprim(prim), dlprim(dlp->dl_primitive)); - } - } - ---- a/pppd/plugins/rp-pppoe/Makefile.linux -+++ b/pppd/plugins/rp-pppoe/Makefile.linux -@@ -28,8 +28,8 @@ COPTS=-O2 -g - CFLAGS=$(COPTS) -I../../../include/linux - all: rp-pppoe.so pppoe-discovery - --pppoe-discovery: libplugin.a pppoe-discovery.o -- $(CC) -o pppoe-discovery pppoe-discovery.o libplugin.a -+pppoe-discovery: pppoe-discovery.o utils.o libplugin.a -+ $(CC) -o pppoe-discovery pppoe-discovery.o utils.o libplugin.a - - pppoe-discovery.o: pppoe-discovery.c - $(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c ---- a/pppd/plugins/rp-pppoe/plugin.c -+++ b/pppd/plugins/rp-pppoe/plugin.c -@@ -35,7 +35,6 @@ static char const RCSID[] = - #include "pppd/pathnames.h" - - #include <linux/types.h> --#include <syslog.h> - #include <sys/ioctl.h> - #include <sys/types.h> - #include <sys/socket.h> -@@ -173,10 +172,8 @@ PPPOEConnectDevice(void) - (unsigned) conn->peerEth[5]); - - if (connect(conn->sessionSocket, (struct sockaddr *) &sp, -- sizeof(struct sockaddr_pppox)) < 0) { -+ sizeof(struct sockaddr_pppox)) < 0) - fatal("Failed to connect PPPoE socket: %d %m", errno); -- return -1; -- } - - return conn->sessionSocket; - } -@@ -320,11 +317,9 @@ plugin_init(void) - } - - add_options(Options); -- -- info("RP-PPPoE plugin version %s compiled against pppd %s", -- RP_VERSION, VERSION); - } - -+#ifdef unused - /********************************************************************** - *%FUNCTION: fatalSys - *%ARGUMENTS: -@@ -378,6 +373,7 @@ sysErr(char const *str) - { - rp_fatal(str); - } -+#endif - - void pppoe_check_options(void) - { ---- a/pppd/plugins/rp-pppoe/pppoe-discovery.c -+++ b/pppd/plugins/rp-pppoe/pppoe-discovery.c -@@ -17,14 +17,8 @@ - - #include "pppoe.h" - --char *xstrdup(const char *s); - void usage(void); - --void die(int status) --{ -- exit(status); --} -- - int main(int argc, char *argv[]) - { - int opt; -@@ -32,17 +26,17 @@ int main(int argc, char *argv[]) - - conn = malloc(sizeof(PPPoEConnection)); - if (!conn) -- fatalSys("malloc"); -+ fatal("malloc"); - - memset(conn, 0, sizeof(PPPoEConnection)); - - while ((opt = getopt(argc, argv, "I:D:VUAS:C:h")) > 0) { - switch(opt) { - case 'S': -- conn->serviceName = xstrdup(optarg); -+ conn->serviceName = strDup(optarg); - break; - case 'C': -- conn->acName = xstrdup(optarg); -+ conn->acName = strDup(optarg); - break; - case 'U': - conn->useHostUniq = 1; -@@ -57,7 +51,7 @@ int main(int argc, char *argv[]) - fprintf(conn->debugFile, "pppoe-discovery %s\n", VERSION); - break; - case 'I': -- conn->ifName = xstrdup(optarg); -+ conn->ifName = strDup(optarg); - break; - case 'A': - /* this is the default */ -@@ -74,7 +68,7 @@ int main(int argc, char *argv[]) - - /* default interface name */ - if (!conn->ifName) -- conn->ifName = strdup("eth0"); -+ conn->ifName = strDup("eth0"); - - conn->discoverySocket = -1; - conn->sessionSocket = -1; -@@ -84,39 +78,6 @@ int main(int argc, char *argv[]) - exit(0); - } - --void rp_fatal(char const *str) --{ -- char buf[1024]; -- -- printErr(str); -- sprintf(buf, "pppoe-discovery: %.256s", str); -- exit(1); --} -- --void fatalSys(char const *str) --{ -- char buf[1024]; -- int i = errno; -- -- sprintf(buf, "%.256s: %.256s", str, strerror(i)); -- printErr(buf); -- sprintf(buf, "pppoe-discovery: %.256s: %.256s", str, strerror(i)); -- exit(1); --} -- --void sysErr(char const *str) --{ -- rp_fatal(str); --} -- --char *xstrdup(const char *s) --{ -- register char *ret = strdup(s); -- if (!ret) -- sysErr("strdup"); -- return ret; --} -- - void usage(void) - { - fprintf(stderr, "Usage: pppoe-discovery [options]\n"); ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -307,12 +307,18 @@ void discovery(PPPoEConnection *conn); - unsigned char *findTag(PPPoEPacket *packet, UINT16_t tagType, - PPPoETag *tag); - -+void dbglog(char *, ...); /* log a debug message */ -+void info(char *, ...); /* log an informational message */ -+void warn(char *, ...); /* log a warning message */ -+void error(char *, ...); /* log an error message */ -+void fatal(char *, ...); /* log an error message and die(1) */ -+ - #define SET_STRING(var, val) do { if (var) free(var); var = strDup(val); } while(0); - - #define CHECK_ROOM(cursor, start, len) \ - do {\ - if (((cursor)-(start))+(len) > MAX_PPPOE_PAYLOAD) { \ -- syslog(LOG_ERR, "Would create too-long packet"); \ -+ error("Would create too-long packet"); \ - return; \ - } \ - } while(0) ---- /dev/null -+++ b/pppd/plugins/rp-pppoe/utils.c -@@ -0,0 +1,62 @@ -+#include <stdio.h> -+#include <stdlib.h> -+#include <unistd.h> -+#include <stdarg.h> -+#include <syslog.h> -+ -+void dbglog(const char *fmt, ...) -+{ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsyslog(LOG_DEBUG, fmt, ap); -+ vfprintf(stderr, fmt, ap); -+ fputs("\n", stderr); -+ va_end(ap); -+} -+ -+void info(const char *fmt, ...) -+{ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsyslog(LOG_INFO, fmt, ap); -+ vfprintf(stderr, fmt, ap); -+ fputs("\n", stderr); -+ va_end(ap); -+} -+ -+void warn(const char *fmt, ...) -+{ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsyslog(LOG_WARNING, fmt, ap); -+ vfprintf(stderr, fmt, ap); -+ fputs("\n", stderr); -+ va_end(ap); -+} -+ -+void error(const char *fmt, ...) -+{ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsyslog(LOG_ERR, fmt, ap); -+ vfprintf(stderr, fmt, ap); -+ fputs("\n", stderr); -+ va_end(ap); -+} -+ -+void fatal(const char *fmt, ...) -+{ -+ va_list ap; -+ -+ va_start(ap, fmt); -+ vsyslog(LOG_ERR, fmt, ap); -+ vfprintf(stderr, fmt, ap); -+ fputs("\n", stderr); -+ va_end(ap); -+ exit(1); -+} -+ diff --git a/package/ppp/patches/110-debian_defaultroute.patch b/package/ppp/patches/110-debian_defaultroute.patch index 3075ff5c2..0a0691e98 100644 --- a/package/ppp/patches/110-debian_defaultroute.patch +++ b/package/ppp/patches/110-debian_defaultroute.patch @@ -1,6 +1,6 @@ --- a/pppd/ipcp.c +++ b/pppd/ipcp.c -@@ -197,6 +197,14 @@ static option_t ipcp_option_list[] = { +@@ -198,6 +198,14 @@ static option_t ipcp_option_list[] = { "disable defaultroute option", OPT_ALIAS | OPT_A2CLR, &ipcp_wantoptions[0].default_route }, @@ -15,7 +15,7 @@ { "proxyarp", o_bool, &ipcp_wantoptions[0].proxy_arp, "Add proxy ARP entry", OPT_ENABLE|1, &ipcp_allowoptions[0].proxy_arp }, { "noproxyarp", o_bool, &ipcp_allowoptions[0].proxy_arp, -@@ -263,7 +271,7 @@ struct protent ipcp_protent = { +@@ -271,7 +279,7 @@ struct protent ipcp_protent = { ip_active_pkt }; @@ -24,7 +24,7 @@ static void ipcp_script __P((char *, int)); /* Run an up/down script */ static void ipcp_script_done __P((void *)); -@@ -1660,7 +1668,8 @@ ip_demand_conf(u) +@@ -1742,7 +1750,8 @@ ip_demand_conf(u) if (!sifnpmode(u, PPP_IP, NPMODE_QUEUE)) return 0; if (wo->default_route) @@ -34,7 +34,7 @@ default_route_set[u] = 1; if (wo->proxy_arp) if (sifproxyarp(u, wo->hisaddr)) -@@ -1742,7 +1751,8 @@ ipcp_up(f) +@@ -1830,7 +1839,8 @@ ipcp_up(f) */ if (demand) { if (go->ouraddr != wo->ouraddr || ho->hisaddr != wo->hisaddr) { @@ -44,7 +44,7 @@ if (go->ouraddr != wo->ouraddr) { warn("Local IP address changed to %I", go->ouraddr); script_setenv("OLDIPLOCAL", ip_ntoa(wo->ouraddr), 0); -@@ -1767,7 +1777,8 @@ ipcp_up(f) +@@ -1855,7 +1865,8 @@ ipcp_up(f) /* assign a default route through the interface if required */ if (ipcp_wantoptions[f->unit].default_route) @@ -54,7 +54,7 @@ default_route_set[f->unit] = 1; /* Make a proxy ARP entry if requested. */ -@@ -1817,7 +1828,8 @@ ipcp_up(f) +@@ -1905,7 +1916,8 @@ ipcp_up(f) /* assign a default route through the interface if required */ if (ipcp_wantoptions[f->unit].default_route) @@ -64,7 +64,7 @@ default_route_set[f->unit] = 1; /* Make a proxy ARP entry if requested. */ -@@ -1894,7 +1906,7 @@ ipcp_down(f) +@@ -1983,7 +1995,7 @@ ipcp_down(f) sifnpmode(f->unit, PPP_IP, NPMODE_DROP); sifdown(f->unit); ipcp_clear_addrs(f->unit, ipcp_gotoptions[f->unit].ouraddr, @@ -73,7 +73,7 @@ } /* Execute the ip-down script */ -@@ -1910,16 +1922,25 @@ ipcp_down(f) +@@ -1999,16 +2011,25 @@ ipcp_down(f) * proxy arp entries, etc. */ static void @@ -125,7 +125,7 @@ .B disconnect \fIscript Execute the command specified by \fIscript\fR, by passing it to a shell, after -@@ -706,7 +711,12 @@ disable both forms of hardware flow cont +@@ -717,7 +722,12 @@ disable both forms of hardware flow cont .TP .B nodefaultroute Disable the \fIdefaultroute\fR option. The system administrator who @@ -141,7 +141,7 @@ .B nodeflate --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -644,7 +644,7 @@ int sif6addr __P((int, eui64_t, eui64_t +@@ -645,7 +645,7 @@ int sif6addr __P((int, eui64_t, eui64_t int cif6addr __P((int, eui64_t, eui64_t)); /* Remove an IPv6 address from i/f */ #endif @@ -161,7 +161,7 @@ static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ static char proxy_arp_dev[16]; /* Device for proxy arp entry */ static u_int32_t our_old_addr; /* for detecting address changes */ -@@ -1520,6 +1522,9 @@ static int read_route_table(struct rtent +@@ -1544,6 +1546,9 @@ static int read_route_table(struct rtent p = NULL; } @@ -171,7 +171,7 @@ SIN_ADDR(rt->rt_dst) = strtoul(cols[route_dest_col], NULL, 16); SIN_ADDR(rt->rt_gateway) = strtoul(cols[route_gw_col], NULL, 16); SIN_ADDR(rt->rt_genmask) = strtoul(cols[route_mask_col], NULL, 16); -@@ -1589,20 +1594,51 @@ int have_route_to(u_int32_t addr) +@@ -1613,20 +1618,51 @@ int have_route_to(u_int32_t addr) /******************************************************************** * * sifdefaultroute - assign a default route through the address given. @@ -236,7 +236,7 @@ } memset (&rt, 0, sizeof (rt)); -@@ -1617,10 +1653,16 @@ int sifdefaultroute (int unit, u_int32_t +@@ -1641,10 +1677,16 @@ int sifdefaultroute (int unit, u_int32_t rt.rt_flags = RTF_UP; if (ioctl(sock_fd, SIOCADDRT, &rt) < 0) { @@ -254,7 +254,7 @@ have_default_route = 1; return 1; -@@ -1649,11 +1691,21 @@ int cifdefaultroute (int unit, u_int32_t +@@ -1675,11 +1717,21 @@ int cifdefaultroute (int unit, u_int32_t rt.rt_flags = RTF_UP; if (ioctl(sock_fd, SIOCDELRT, &rt) < 0 && errno != ESRCH) { if (still_ppp()) { diff --git a/package/ppp/patches/201-mppe_mppc_1.1.patch b/package/ppp/patches/201-mppe_mppc_1.1.patch index 93312baee..62b09d4a1 100644 --- a/package/ppp/patches/201-mppe_mppc_1.1.patch +++ b/package/ppp/patches/201-mppe_mppc_1.1.patch @@ -9,27 +9,9 @@ * * NOTE TO MAINTAINERS: * If you modify this file at all, please set the above date. -@@ -86,7 +86,7 @@ struct compressor { - - /* Compress a packet */ - int (*compress) (void *state, unsigned char *rptr, -- unsigned char *obuf, int isize, int osize); -+ unsigned char *obuf, int isize, int osize); - - /* Return compression statistics */ - void (*comp_stat) (void *state, struct compstat *stats); -@@ -107,7 +107,7 @@ struct compressor { - - /* Decompress a packet. */ - int (*decompress) (void *state, unsigned char *ibuf, int isize, -- unsigned char *obuf, int osize); -+ unsigned char *obuf, int osize); - - /* Update state for an incompressible packet received */ - void (*incomp) (void *state, unsigned char *ibuf, int icnt); -@@ -288,6 +288,33 @@ struct compressor { - opts |= MPPE_OPT_UNKNOWN; \ - } while (/* CONSTCOND */ 0) +@@ -201,6 +201,33 @@ struct compressor { + #define CI_MPPE 18 /* config option for MPPE */ + #define CILEN_MPPE 6 /* length of config option */ +/* MPPE/MPPC definitions by J.D.*/ +#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */ @@ -63,9 +45,9 @@ */ --- a/include/net/ppp-comp.h +++ b/include/net/ppp-comp.h -@@ -255,6 +255,33 @@ struct compressor { - opts |= MPPE_OPT_UNKNOWN; \ - } while (/* CONSTCOND */ 0) +@@ -168,6 +168,33 @@ struct compressor { + #define CI_MPPE 18 /* config option for MPPE */ + #define CILEN_MPPE 6 /* length of config option */ +/* MPPE/MPPC definitions by J.D.*/ +#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */ @@ -705,15 +687,6 @@ if (go->deflate) { if (len < CILEN_DEFLATE || p[0] != (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT) -@@ -891,7 +1070,7 @@ ccp_ackci(f, p, len) - - /* - * ccp_nakci - process received configure-nak. -- * Returns 1 iff the nak was OK. -+ * Returns 1 if the nak was OK. - */ - static int - ccp_nakci(f, p, len, treat_as_reject) @@ -901,6 +1080,8 @@ ccp_nakci(f, p, len, treat_as_reject) int treat_as_reject; { @@ -930,6 +903,10 @@ - - /* Nak if anything unsupported or unknown are set. */ - if (ho->mppe & MPPE_OPT_UNSUPPORTED) { +- newret = CONFNAK; +- ho->mppe &= ~MPPE_OPT_UNSUPPORTED; +- } +- if (ho->mppe & MPPE_OPT_UNKNOWN) { + p2 = p[2]; + p5 = p[5]; + /* not sure what they want, tell 'em what we got */ @@ -938,10 +915,6 @@ + MPPE_MPPC)) != 0 || p[5] == 0) || + (p[2] == 0 && p[3] == 0 && p[4] == 0 && p[5] == 0)) { newret = CONFNAK; -- ho->mppe &= ~MPPE_OPT_UNSUPPORTED; -- } -- if (ho->mppe & MPPE_OPT_UNKNOWN) { -- newret = CONFNAK; - ho->mppe &= ~MPPE_OPT_UNKNOWN; - } - @@ -1471,11 +1444,6 @@ * Send a reset-request to reset the peer's compressor. * We don't do that if we are still waiting for an * acknowledgement to a previous reset-request. -@@ -1675,4 +2180,3 @@ ccp_rack_timeout(arg) - } else - ccp_localstate[f->unit] &= ~RACK_PENDING; - } -- --- a/pppd/ccp.h +++ b/pppd/ccp.h @@ -37,9 +37,17 @@ typedef struct ccp_options { @@ -1498,7 +1466,7 @@ --- a/pppd/chap_ms.c +++ b/pppd/chap_ms.c -@@ -897,13 +897,17 @@ set_mppe_enc_types(int policy, int types +@@ -898,13 +898,17 @@ set_mppe_enc_types(int policy, int types /* * Disable undesirable encryption types. Note that we don't ENABLE * any encryption types, to avoid overriding manual configuration. diff --git a/package/ppp/patches/202-no_strip.patch b/package/ppp/patches/202-no_strip.patch index ef7c696aa..359db14a3 100644 --- a/package/ppp/patches/202-no_strip.patch +++ b/package/ppp/patches/202-no_strip.patch @@ -46,7 +46,7 @@ --- a/pppd/plugins/rp-pppoe/Makefile.linux +++ b/pppd/plugins/rp-pppoe/Makefile.linux -@@ -39,9 +39,9 @@ rp-pppoe.so: libplugin.a plugin.o +@@ -43,9 +43,9 @@ rp-pppoe.so: plugin.o discovery.o if.o c install: all $(INSTALL) -d -m 755 $(LIBDIR) @@ -57,7 +57,7 @@ + $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR) clean: - rm -f *.o *.so + rm -f *.o *.so pppoe-discovery --- a/pppdump/Makefile.linux +++ b/pppdump/Makefile.linux @@ -17,5 +17,5 @@ clean: diff --git a/package/ppp/patches/205-no_exponential_timeout.patch b/package/ppp/patches/205-no_exponential_timeout.patch index 76a200d38..14d00cf92 100644 --- a/package/ppp/patches/205-no_exponential_timeout.patch +++ b/package/ppp/patches/205-no_exponential_timeout.patch @@ -1,21 +1,16 @@ --- a/pppd/plugins/rp-pppoe/discovery.c +++ b/pppd/plugins/rp-pppoe/discovery.c -@@ -593,12 +593,14 @@ discovery(PPPoEConnection *conn) +@@ -548,7 +548,9 @@ discovery(PPPoEConnection *conn) conn->discoveryState = STATE_SENT_PADI; waitForPADO(conn, timeout); +#if 0 - /* If we're just probing for access concentrators, don't do - exponential backoff. This reduces the time for an unsuccessful - probe to 15 seconds. */ - if (!conn->printACNames) { - timeout *= 2; - } + timeout *= 2; +#endif - if (conn->printACNames && conn->numPADOs) { - break; - } -@@ -621,7 +623,9 @@ discovery(PPPoEConnection *conn) + } while (conn->discoveryState == STATE_SENT_PADI); + + timeout = conn->discoveryTimeout; +@@ -563,7 +565,9 @@ discovery(PPPoEConnection *conn) sendPADR(conn); conn->discoveryState = STATE_SENT_PADR; waitForPADS(conn, timeout); diff --git a/package/ppp/patches/206-compensate_time_change.patch b/package/ppp/patches/206-compensate_time_change.patch index f842ff2ee..4ec488fa4 100644 --- a/package/ppp/patches/206-compensate_time_change.patch +++ b/package/ppp/patches/206-compensate_time_change.patch @@ -8,7 +8,7 @@ #include "pppd.h" #include "magic.h" -@@ -227,6 +228,7 @@ static struct subprocess *children; +@@ -228,6 +229,7 @@ static struct subprocess *children; /* Prototypes for procedures local to this file. */ @@ -16,7 +16,7 @@ static void setup_signals __P((void)); static void create_pidfile __P((int pid)); static void create_linkpidfile __P((int pid)); -@@ -532,6 +534,7 @@ main(argc, argv) +@@ -533,6 +535,7 @@ main(argc, argv) info("Starting link"); } @@ -24,7 +24,7 @@ gettimeofday(&start_time, NULL); script_unsetenv("CONNECT_TIME"); script_unsetenv("BYTES_SENT"); -@@ -1264,6 +1267,36 @@ struct callout { +@@ -1265,6 +1268,36 @@ struct callout { static struct callout *callout = NULL; /* Callout list */ static struct timeval timenow; /* Current time */ @@ -61,7 +61,7 @@ /* * timeout - Schedule a timeout. -@@ -1334,6 +1367,8 @@ calltimeout() +@@ -1335,6 +1368,8 @@ calltimeout() { struct callout *p; @@ -70,7 +70,7 @@ while (callout != NULL) { p = callout; -@@ -1361,6 +1396,8 @@ timeleft(tvp) +@@ -1362,6 +1397,8 @@ timeleft(tvp) { if (callout == NULL) return NULL; diff --git a/package/ppp/patches/310-precompile_filter.patch b/package/ppp/patches/310-precompile_filter.patch index c35b4c224..cbcdfa3a2 100644 --- a/package/ppp/patches/310-precompile_filter.patch +++ b/package/ppp/patches/310-precompile_filter.patch @@ -64,7 +64,7 @@ #ifdef MAXOCTETS { "maxoctets", o_int, &maxoctets, "Set connection traffic limit", -@@ -1456,6 +1472,29 @@ callfile(argv) +@@ -1463,6 +1479,29 @@ callfile(argv) return ok; } diff --git a/package/ppp/patches/320-custom_iface_names.patch b/package/ppp/patches/320-custom_iface_names.patch index ff9ef86dd..542f0a0d2 100644 --- a/package/ppp/patches/320-custom_iface_names.patch +++ b/package/ppp/patches/320-custom_iface_names.patch @@ -1,6 +1,6 @@ --- a/pppd/main.c +++ b/pppd/main.c -@@ -742,8 +742,11 @@ void +@@ -743,8 +743,11 @@ void set_ifunit(iskey) int iskey; { @@ -47,7 +47,7 @@ /* * Limits. */ -@@ -308,6 +312,7 @@ extern char *record_file; /* File to rec +@@ -309,6 +313,7 @@ extern char *record_file; /* File to rec extern bool sync_serial; /* Device is synchronous serial device */ extern int maxfail; /* Max # of unsuccessful connection attempts */ extern char linkname[MAXPATHLEN]; /* logical name for link */ @@ -115,12 +115,12 @@ if (argc > 0) interface = argv[0]; -+/* ++#if 0 if (sscanf(interface, PPP_DRV_NAME "%d", &unit) != 1) { fprintf(stderr, "%s: invalid interface '%s' specified\n", progname, interface); } -+*/ ++#endif #ifndef STREAMS { diff --git a/package/ppp/patches/330-retain_foreign_default_routes.patch b/package/ppp/patches/330-retain_foreign_default_routes.patch index 3a98b6b98..dc6ed8d1f 100644 --- a/package/ppp/patches/330-retain_foreign_default_routes.patch +++ b/package/ppp/patches/330-retain_foreign_default_routes.patch @@ -1,6 +1,6 @@ --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -1717,6 +1717,7 @@ int cifdefaultroute (int unit, u_int32_t +@@ -1743,6 +1743,7 @@ int cifdefaultroute (int unit, u_int32_t SIN_ADDR(rt.rt_genmask) = 0L; } diff --git a/package/ppp/patches/340-populate_default_gateway.patch b/package/ppp/patches/340-populate_default_gateway.patch index ca11206c4..ae495ee64 100644 --- a/package/ppp/patches/340-populate_default_gateway.patch +++ b/package/ppp/patches/340-populate_default_gateway.patch @@ -1,6 +1,6 @@ --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -1673,6 +1673,9 @@ int sifdefaultroute (int unit, u_int32_t +@@ -1697,6 +1697,9 @@ int sifdefaultroute (int unit, u_int32_t memset (&rt, 0, sizeof (rt)); SET_SA_FAMILY (rt.rt_dst, AF_INET); @@ -10,7 +10,7 @@ rt.rt_dev = ifname; if (kernel_version > KVERSION(2,1,0)) { -@@ -1680,7 +1683,7 @@ int sifdefaultroute (int unit, u_int32_t +@@ -1704,7 +1707,7 @@ int sifdefaultroute (int unit, u_int32_t SIN_ADDR(rt.rt_genmask) = 0L; } diff --git a/package/ppp/patches/350-survive_bad_pads_packets.patch b/package/ppp/patches/350-survive_bad_pads_packets.patch index 66c656dc7..e69de29bb 100644 --- a/package/ppp/patches/350-survive_bad_pads_packets.patch +++ b/package/ppp/patches/350-survive_bad_pads_packets.patch @@ -1,109 +0,0 @@ ---- a/pppd/plugins/rp-pppoe/common.c -+++ b/pppd/plugins/rp-pppoe/common.c -@@ -75,7 +75,9 @@ parsePacket(PPPoEPacket *packet, ParseFu - error("Invalid PPPoE tag length (%u)", tagLen); - return -1; - } -- func(tagType, tagLen, curTag+TAG_HDR_SIZE, extra); -+ if (func(tagType, tagLen, curTag+TAG_HDR_SIZE, extra)) { -+ return -1; -+ } - curTag = curTag + TAG_HDR_SIZE + tagLen; - } - return 0; ---- a/pppd/plugins/rp-pppoe/discovery.c -+++ b/pppd/plugins/rp-pppoe/discovery.c -@@ -48,7 +48,7 @@ static char const RCSID[] = - *%DESCRIPTION: - * If a HostUnique tag is found which matches our PID, sets *extra to 1. - ***********************************************************************/ --void -+int - parseForHostUniq(UINT16_t type, UINT16_t len, unsigned char *data, - void *extra) - { -@@ -60,6 +60,7 @@ parseForHostUniq(UINT16_t type, UINT16_t - *val = 1; - } - } -+ return 0; - } - - /********************************************************************** -@@ -102,7 +103,7 @@ packetIsForMe(PPPoEConnection *conn, PPP - *%DESCRIPTION: - * Picks interesting tags out of a PADO packet - ***********************************************************************/ --void -+int - parsePADOTags(UINT16_t type, UINT16_t len, unsigned char *data, - void *extra) - { -@@ -181,6 +182,7 @@ parsePADOTags(UINT16_t type, UINT16_t le - } - break; - } -+ return 0; - } - - /********************************************************************** -@@ -195,7 +197,7 @@ parsePADOTags(UINT16_t type, UINT16_t le - *%DESCRIPTION: - * Picks interesting tags out of a PADS packet - ***********************************************************************/ --void -+int - parsePADSTags(UINT16_t type, UINT16_t len, unsigned char *data, - void *extra) - { -@@ -205,17 +207,21 @@ parsePADSTags(UINT16_t type, UINT16_t le - dbglog("PADS: Service-Name: '%.*s'", (int) len, data); - break; - case TAG_SERVICE_NAME_ERROR: -- fatal("PADS: Service-Name-Error: %.*s", (int) len, data); -+ error("PADS: Service-Name-Error: %.*s", (int) len, data); -+ return -1; - case TAG_AC_SYSTEM_ERROR: -- fatal("PADS: System-Error: %.*s", (int) len, data); -+ error("PADS: System-Error: %.*s", (int) len, data); -+ return -1; - case TAG_GENERIC_ERROR: -- fatal("PADS: Generic-Error: %.*s", (int) len, data); -+ error("PADS: Generic-Error: %.*s", (int) len, data); -+ return -1; - case TAG_RELAY_SESSION_ID: - conn->relayId.type = htons(type); - conn->relayId.length = htons(len); - memcpy(conn->relayId.payload, data, len); - break; - } -+ return 0; - } - - /*********************************************************************** -@@ -532,9 +538,11 @@ waitForPADS(PPPoEConnection *conn, int t - /* Is it PADS? */ - if (packet.code == CODE_PADS) { - /* Parse for goodies */ -- parsePacket(&packet, parsePADSTags, conn); -- conn->discoveryState = STATE_SESSION; -- break; -+ if (!parsePacket(&packet, parsePADSTags, conn)) -+ { -+ conn->discoveryState = STATE_SESSION; -+ break; -+ } - } - } while (conn->discoveryState != STATE_SESSION); - ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -238,7 +238,7 @@ typedef struct PPPoETagStruct { - #define READ_CHUNK 4096 - - /* Function passed to parsePacket */ --typedef void ParseFunc(UINT16_t type, -+typedef int ParseFunc(UINT16_t type, - UINT16_t len, - unsigned char *data, - void *extra); diff --git a/package/ppp/patches/400-simplify_kernel_checks.patch b/package/ppp/patches/400-simplify_kernel_checks.patch index e82996c5f..c48141311 100644 --- a/package/ppp/patches/400-simplify_kernel_checks.patch +++ b/package/ppp/patches/400-simplify_kernel_checks.patch @@ -19,7 +19,7 @@ #define MAX_IFS 100 -@@ -1414,11 +1414,12 @@ int ccp_fatal_error (int unit) +@@ -1438,11 +1438,12 @@ int ccp_fatal_error (int unit) * * path_to_procfs - find the path to the proc file system mount point */ @@ -34,7 +34,7 @@ struct mntent *mntent; FILE *fp; -@@ -1440,6 +1441,7 @@ static char *path_to_procfs(const char * +@@ -1464,6 +1465,7 @@ static char *path_to_procfs(const char * fclose (fp); } } @@ -42,9 +42,9 @@ strlcpy(proc_path + proc_path_len, tail, sizeof(proc_path) - proc_path_len); -@@ -2098,11 +2100,13 @@ int ppp_available(void) - "ppp.o exists in /lib/modules/`uname -r`/net.\n" - "See README.linux file in the ppp distribution for more details.\n"; +@@ -2116,15 +2118,19 @@ int ppp_available(void) + int my_version, my_modification, my_patch; + int osmaj, osmin, ospatch; +#if 0 /* get the kernel version now, since we are called before sys_init */ @@ -55,10 +55,6 @@ +#endif fd = open("/dev/ppp", O_RDWR); - #if 0 -@@ -2121,7 +2125,9 @@ int ppp_available(void) - } - #endif /* 0 */ if (fd >= 0) { +#if 0 new_style_driver = 1; @@ -66,7 +62,7 @@ /* XXX should get from driver */ driver_version = 2; -@@ -2168,6 +2174,7 @@ int ppp_available(void) +@@ -2185,6 +2191,7 @@ int ppp_available(void) if (ok && ((ifr.ifr_hwaddr.sa_family & ~0xFF) != ARPHRD_PPP)) ok = 0; @@ -74,7 +70,7 @@ /* * This is the PPP device. Validate the version of the driver at this -@@ -2659,6 +2666,7 @@ get_pty(master_fdp, slave_fdp, slave_nam +@@ -2678,6 +2685,7 @@ get_pty(master_fdp, slave_fdp, slave_nam } #endif /* TIOCGPTN */ @@ -82,7 +78,7 @@ if (sfd < 0) { /* the old way - scan through the pty name space */ for (i = 0; i < 64; ++i) { -@@ -2677,6 +2685,7 @@ get_pty(master_fdp, slave_fdp, slave_nam +@@ -2696,6 +2704,7 @@ get_pty(master_fdp, slave_fdp, slave_nam } } } @@ -92,7 +88,7 @@ return 0; --- a/pppd/plugins/pppoatm/pppoatm.c +++ b/pppd/plugins/pppoatm/pppoatm.c -@@ -210,14 +210,6 @@ static void recv_config_pppoa(int mru, +@@ -171,14 +171,6 @@ static void disconnect_pppoatm(void) void plugin_init(void) { @@ -104,12 +100,12 @@ -#else - fatal("No PPPoATM support on this OS"); -#endif + info("PPPoATM plugin_init"); add_options(pppoa_options); } - --- a/pppd/plugins/rp-pppoe/plugin.c +++ b/pppd/plugins/rp-pppoe/plugin.c -@@ -55,9 +55,6 @@ static char const RCSID[] = +@@ -60,9 +60,6 @@ static char const RCSID[] = char pppd_version[] = VERSION; @@ -119,7 +115,7 @@ char *pppd_pppoe_service = NULL; static char *acName = NULL; static char *existingSession = NULL; -@@ -312,10 +309,6 @@ PPPoEDevnameHook(char *cmd, char **argv, +@@ -340,10 +337,6 @@ PPPoEDevnameHook(char *cmd, char **argv, void plugin_init(void) { @@ -128,5 +124,5 @@ - } - add_options(Options); - } + info("RP-PPPoE plugin version %s compiled against pppd %s", diff --git a/package/ppp/patches/401-no_record_file.patch b/package/ppp/patches/401-no_record_file.patch index 431fcac78..68837206f 100644 --- a/package/ppp/patches/401-no_record_file.patch +++ b/package/ppp/patches/401-no_record_file.patch @@ -1,6 +1,6 @@ --- a/pppd/pppd.h +++ b/pppd/pppd.h -@@ -308,7 +308,6 @@ extern int holdoff; /* Dead time before +@@ -309,7 +309,6 @@ extern int holdoff; /* Dead time before extern bool holdoff_specified; /* true if user gave a holdoff value */ extern bool notty; /* Stdin/out is not a tty */ extern char *pty_socket; /* Socket to connect to pty */ @@ -10,7 +10,7 @@ extern char linkname[MAXPATHLEN]; /* logical name for link */ --- a/pppd/tty.c +++ b/pppd/tty.c -@@ -144,7 +144,7 @@ char *disconnect_script = NULL; /* Scrip +@@ -145,7 +145,7 @@ char *disconnect_script = NULL; /* Scrip char *welcomer = NULL; /* Script to run after phys link estab. */ char *ptycommand = NULL; /* Command to run on other side of pty */ bool notty = 0; /* Stdin/out is not a tty */ @@ -19,7 +19,7 @@ int max_data_rate; /* max bytes/sec through charshunt */ bool sync_serial = 0; /* Device is synchronous serial device */ char *pty_socket = NULL; /* Socket to connect to pty */ -@@ -200,8 +200,10 @@ option_t tty_options[] = { +@@ -201,8 +201,10 @@ option_t tty_options[] = { "Send and receive over socket, arg is host:port", OPT_PRIO | OPT_DEVNAM }, diff --git a/package/ppp/patches/403-no_wtmp.patch b/package/ppp/patches/403-no_wtmp.patch index c3e9c7b61..018bd5b2a 100644 --- a/package/ppp/patches/403-no_wtmp.patch +++ b/package/ppp/patches/403-no_wtmp.patch @@ -1,6 +1,6 @@ --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c -@@ -2237,6 +2237,7 @@ int ppp_available(void) +@@ -2254,6 +2254,7 @@ int ppp_available(void) void logwtmp (const char *line, const char *name, const char *host) { @@ -8,7 +8,7 @@ struct utmp ut, *utp; pid_t mypid = getpid(); #if __GLIBC__ < 2 -@@ -2302,6 +2303,7 @@ void logwtmp (const char *line, const ch +@@ -2319,6 +2320,7 @@ void logwtmp (const char *line, const ch close (wtmp); } #endif diff --git a/package/ppp/patches/404-remove_obsolete_protocol_names.patch b/package/ppp/patches/404-remove_obsolete_protocol_names.patch index f04d971a2..13a338f3e 100644 --- a/package/ppp/patches/404-remove_obsolete_protocol_names.patch +++ b/package/ppp/patches/404-remove_obsolete_protocol_names.patch @@ -1,6 +1,6 @@ --- a/pppd/main.c +++ b/pppd/main.c -@@ -879,14 +879,17 @@ struct protocol_list { +@@ -880,14 +880,17 @@ struct protocol_list { const char *name; } protocol_list[] = { { 0x21, "IP" }, @@ -18,7 +18,7 @@ { 0x33, "Stream Protocol ST-II" }, { 0x35, "Banyan Vines" }, { 0x39, "AppleTalk EDDP" }, -@@ -900,8 +903,11 @@ struct protocol_list { +@@ -901,8 +904,11 @@ struct protocol_list { { 0x49, "Serial Data Transport Protocol (PPP-SDTP)" }, { 0x4b, "SNA over 802.2" }, { 0x4d, "SNA" }, @@ -30,7 +30,7 @@ { 0x53, "Encryption" }, { 0x55, "Individual Link Encryption" }, { 0x57, "IPv6" }, -@@ -912,12 +918,15 @@ struct protocol_list { +@@ -913,12 +919,15 @@ struct protocol_list { { 0x65, "RTP IPHC Compressed non-TCP" }, { 0x67, "RTP IPHC Compressed UDP 8" }, { 0x69, "RTP IPHC Compressed RTP 8" }, @@ -46,7 +46,7 @@ { 0x0203, "IBM Source Routing BPDU" }, { 0x0205, "DEC LANBridge100 Spanning Tree" }, { 0x0207, "Cisco Discovery Protocol" }, -@@ -929,15 +938,19 @@ struct protocol_list { +@@ -930,15 +939,19 @@ struct protocol_list { { 0x0231, "Luxcom" }, { 0x0233, "Sigma Network Systems" }, { 0x0235, "Apple Client Server Protocol" }, @@ -66,7 +66,7 @@ { 0x4001, "Cray Communications Control Protocol" }, { 0x4003, "CDPD Mobile Network Registration Protocol" }, { 0x4005, "Expand accelerator protocol" }, -@@ -948,8 +961,10 @@ struct protocol_list { +@@ -949,8 +962,10 @@ struct protocol_list { { 0x4023, "RefTek Protocol" }, { 0x4025, "Fibre Channel" }, { 0x4027, "EMIT Protocols" }, @@ -77,7 +77,7 @@ { 0x8023, "OSI Network Layer Control Protocol" }, { 0x8025, "Xerox NS IDP Control Protocol" }, { 0x8027, "DECnet Phase IV Control Protocol" }, -@@ -958,7 +973,9 @@ struct protocol_list { +@@ -959,7 +974,9 @@ struct protocol_list { { 0x8031, "Bridging NCP" }, { 0x8033, "Stream Protocol Control Protocol" }, { 0x8035, "Banyan Vines Control Protocol" }, @@ -87,7 +87,7 @@ { 0x803f, "NETBIOS Framing Control Protocol" }, { 0x8041, "Cisco Systems Control Protocol" }, { 0x8043, "Ascom Timeplex" }, -@@ -967,18 +984,24 @@ struct protocol_list { +@@ -968,18 +985,24 @@ struct protocol_list { { 0x8049, "Serial Data Control Protocol (PPP-SDCP)" }, { 0x804b, "SNA over 802.2 Control Protocol" }, { 0x804d, "SNA Control Protocol" }, @@ -98,7 +98,7 @@ +#endif { 0x8053, "Encryption Control Protocol" }, { 0x8055, "Individual Link Encryption Control Protocol" }, - { 0x8057, "IPv6 Control Protovol" }, + { 0x8057, "IPv6 Control Protocol" }, { 0x8059, "PPP Muxing Control Protocol" }, { 0x805b, "Vendor-Specific Network Control Protocol (VSNCP)" }, +#if 0 @@ -112,7 +112,7 @@ { 0x8207, "Cisco Discovery Protocol Control" }, { 0x8209, "Netcs Twin Routing" }, { 0x820b, "STP - Control Protocol" }, -@@ -987,24 +1010,29 @@ struct protocol_list { +@@ -988,24 +1011,29 @@ struct protocol_list { { 0x8281, "MPLSCP" }, { 0x8285, "IEEE p1284.4 standard - Protocol Control" }, { 0x8287, "ETSI TETRA TNP1 Control Protocol" }, diff --git a/package/ppp/patches/430-pppol2tpv3-struct.patch b/package/ppp/patches/430-pppol2tpv3-struct.patch new file mode 100644 index 000000000..c2f163b81 --- /dev/null +++ b/package/ppp/patches/430-pppol2tpv3-struct.patch @@ -0,0 +1,23 @@ +--- a/include/linux/if_pppol2tp.h ++++ b/include/linux/if_pppol2tp.h +@@ -32,6 +32,20 @@ struct pppol2tp_addr + __u16 d_tunnel, d_session; /* For sending outgoing packets */ + }; + ++/* The L2TPv3 protocol changes tunnel and session ids from 16 to 32 ++ * bits. So we need a different sockaddr structure. ++ */ ++struct pppol2tpv3_addr { ++ pid_t pid; /* pid that owns the fd. ++ * 0 => current */ ++ int fd; /* FD of UDP or IP socket to use */ ++ ++ struct sockaddr_in addr; /* IP address and port to send to */ ++ ++ __u32 s_tunnel, s_session; /* For matching incoming packets */ ++ __u32 d_tunnel, d_session; /* For sending outgoing packets */ ++}; ++ + /* Socket options: + * DEBUG - bitmask of debug message categories + * SENDSEQ - 0 => don't send packets with sequence numbers |