From: fendo Date: Tue, 8 Jan 2013 22:24:31 +0000 (+0100) Subject: rename attribut interface pppoe to bind X-Git-Tag: 2.2.1-2fdn3.3~4 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/d547c00f76be21289a5ba403b3d94818d8696360?hp=11996ba4147678c1d400dcc16e33d83a9a3ede9c rename attribut interface pppoe to bind --- diff --git a/l2tpns.c b/l2tpns.c index 71d5857..0da9a24 100644 --- a/l2tpns.c +++ b/l2tpns.c @@ -187,7 +187,7 @@ config_descriptt config_values[] = { CONFIG("bind_address_remotelns", bind_address_remotelns, IPv4), CONFIG("bind_portremotelns", bind_portremotelns, SHORT), #endif - CONFIG("pppoe_if_name", pppoe_if_name, STRING), + CONFIG("pppoe_if_to_bind", pppoe_if_to_bind, STRING), CONFIG("pppoe_service_name", pppoe_service_name, STRING), CONFIG("pppoe_ac_name", pppoe_ac_name, STRING), { NULL, 0, 0, 0 }, @@ -5121,10 +5121,10 @@ int main(int argc, char *argv[]) inittun(); LOG(1, 0, 0, "Set up on interface %s\n", config->tundevicename); - if (*config->pppoe_if_name) + if (*config->pppoe_if_to_bind) { init_pppoe(); - LOG(1, 0, 0, "Set up on pppoe interface %s\n", config->pppoe_if_name); + LOG(1, 0, 0, "Set up on pppoe interface %s\n", config->pppoe_if_to_bind); } initudp(); initrad(); diff --git a/l2tpns.h b/l2tpns.h index b4ab8e8..e690ec6 100644 --- a/l2tpns.h +++ b/l2tpns.h @@ -775,7 +775,7 @@ typedef struct uint16_t bind_portremotelns; in_addr_t bind_address_remotelns; #endif - char pppoe_if_name[IFNAMSIZ]; // Name pppoe interface to bind + char pppoe_if_to_bind[IFNAMSIZ]; // Name pppoe interface to bind char pppoe_service_name[64]; // pppoe service name char pppoe_ac_name[64]; uint8_t pppoe_hwaddr[ETH_ALEN]; // MAC addr of interface pppoe to bind diff --git a/pppoe.c b/pppoe.c index d00c64f..52b554e 100644 --- a/pppoe.c +++ b/pppoe.c @@ -97,9 +97,9 @@ static void init_pppoe_disc(void) exit(1); } - assert(strlen(ifr.ifr_name) < sizeof(config->pppoe_if_name) - 1); - if (*config->pppoe_if_name) - strncpy(ifr.ifr_name, config->pppoe_if_name, IFNAMSIZ); + assert(strlen(ifr.ifr_name) < sizeof(config->pppoe_if_to_bind) - 1); + if (*config->pppoe_if_to_bind) + strncpy(ifr.ifr_name, config->pppoe_if_to_bind, IFNAMSIZ); if (ioctl(pppoediscfd, SIOCGIFHWADDR, &ifr)) { @@ -109,7 +109,7 @@ static void init_pppoe_disc(void) if ((ifr.ifr_hwaddr.sa_data[0] & 1) != 0) { - LOG(0, 0, 0, "Error pppoe: interface %s has not unicast address\n", config->pppoe_if_name); + LOG(0, 0, 0, "Error pppoe: interface %s has not unicast address\n", config->pppoe_if_to_bind); exit(1); } @@ -122,7 +122,7 @@ static void init_pppoe_disc(void) } if (ifr.ifr_mtu < ETH_DATA_LEN) - LOG(0, 0, 0, "Error pppoe: interface %s has MTU of %i, should be %i\n", config->pppoe_if_name, ifr.ifr_mtu, ETH_DATA_LEN); + LOG(0, 0, 0, "Error pppoe: interface %s has MTU of %i, should be %i\n", config->pppoe_if_to_bind, ifr.ifr_mtu, ETH_DATA_LEN); if (ioctl(pppoediscfd, SIOCGIFINDEX, &ifr)) { @@ -174,9 +174,9 @@ static void init_pppoe_sess(void) exit(1); } - assert(strlen(ifr.ifr_name) < sizeof(config->pppoe_if_name) - 1); - if (*config->pppoe_if_name) - strncpy(ifr.ifr_name, config->pppoe_if_name, IFNAMSIZ); + assert(strlen(ifr.ifr_name) < sizeof(config->pppoe_if_to_bind) - 1); + if (*config->pppoe_if_to_bind) + strncpy(ifr.ifr_name, config->pppoe_if_to_bind, IFNAMSIZ); if (ioctl(pppoesessfd, SIOCGIFHWADDR, &ifr)) { @@ -186,7 +186,7 @@ static void init_pppoe_sess(void) if ((ifr.ifr_hwaddr.sa_data[0] & 1) != 0) { - LOG(0, 0, 0, "Error pppoe: interface %s has not unicast address\n", config->pppoe_if_name); + LOG(0, 0, 0, "Error pppoe: interface %s has not unicast address\n", config->pppoe_if_to_bind); exit(1); } @@ -199,7 +199,7 @@ static void init_pppoe_sess(void) } if (ifr.ifr_mtu < ETH_DATA_LEN) - LOG(0, 0, 0, "Error pppoe: interface %s has MTU of %i, should be %i\n", config->pppoe_if_name, ifr.ifr_mtu, ETH_DATA_LEN); + LOG(0, 0, 0, "Error pppoe: interface %s has MTU of %i, should be %i\n", config->pppoe_if_to_bind, ifr.ifr_mtu, ETH_DATA_LEN); if (ioctl(pppoesessfd, SIOCGIFINDEX, &ifr)) { @@ -1115,7 +1115,7 @@ void pppoe_send_garp() struct ifreq ifr; uint8_t mac[6]; - if (!*config->pppoe_if_name) + if (!*config->pppoe_if_to_bind) return; s = socket(PF_INET, SOCK_DGRAM, 0); @@ -1125,7 +1125,7 @@ void pppoe_send_garp() return; } memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, config->pppoe_if_name, sizeof(ifr.ifr_name) - 1); + strncpy(ifr.ifr_name, config->pppoe_if_to_bind, sizeof(ifr.ifr_name) - 1); if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0) { LOG(0, 0, 0, "Error getting eth0 hardware address for GARP: %s\n", strerror(errno));