diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-03-20 16:03:08 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-03-20 16:03:08 +0100 |
| commit | 16e6a01a6454dc791b7af593390616b4a29724c7 (patch) | |
| tree | d399bda96f4a03d3a328d3a770db618ab0dc9f87 /src | |
| parent | f7b4b7bd19b16d11491f18891942f6d48c2fcf7e (diff) | |
| download | conntrack-tools-16e6a01a6454dc791b7af593390616b4a29724c7.tar.gz conntrack-tools-16e6a01a6454dc791b7af593390616b4a29724c7.zip | |
mcast: remove several unused structure fields
This patch removes several structure fields that are unused.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mcast.c | 17 | ||||
| -rw-r--r-- | src/read_config_yy.y | 4 |
2 files changed, 1 insertions, 20 deletions
diff --git a/src/mcast.c b/src/mcast.c index 3dff855..600fdc2 100644 --- a/src/mcast.c +++ b/src/mcast.c @@ -46,8 +46,6 @@ struct mcast_sock *mcast_server_create(struct mcast_conf *conf) return NULL; memset(m, 0, sizeof(struct mcast_sock)); - m->interface_idx = conf->interface_idx; - switch(conf->ipproto) { case AF_INET: mreq.ipv4.imr_multiaddr.s_addr = conf->in.inet_addr.s_addr; @@ -78,19 +76,6 @@ struct mcast_sock *mcast_server_create(struct mcast_conf *conf) return NULL; } - if(conf->iface[0]) { - struct ifreq ifr; - - strncpy(ifr.ifr_name, conf->iface, sizeof(ifr.ifr_name)); - - if (ioctl(m->fd, SIOCGIFMTU, &ifr) == -1) { - close(m->fd); - free(m); - return NULL; - } - conf->mtu = ifr.ifr_mtu; - } - if (setsockopt(m->fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(int)) == -1) { close(m->fd); @@ -214,8 +199,6 @@ struct mcast_sock *mcast_client_create(struct mcast_conf *conf) return NULL; memset(m, 0, sizeof(struct mcast_sock)); - m->interface_idx = conf->interface_idx; - if ((m->fd = socket(conf->ipproto, SOCK_DGRAM, 0)) == -1) { free(m); return NULL; diff --git a/src/read_config_yy.y b/src/read_config_yy.y index 7b62cf3..4e60d95 100644 --- a/src/read_config_yy.y +++ b/src/read_config_yy.y @@ -330,7 +330,7 @@ multicast_option : T_IPV6_ADDR T_IP conf.channel[conf.channel_num].u.mcast.ipproto = AF_INET6; - if (conf.channel[conf.channel_num].u.mcast.iface[0] && + if (conf.channel[conf.channel_num].channel_ifname[0] && !conf.channel[conf.channel_num].u.mcast.ifa.interface_index6) { unsigned int idx; @@ -376,14 +376,12 @@ multicast_option : T_IFACE T_STRING __max_dedicated_links_reached(); strncpy(conf.channel[conf.channel_num].channel_ifname, $2, IFNAMSIZ); - strncpy(conf.channel[conf.channel_num].u.mcast.iface, $2, IFNAMSIZ); idx = if_nametoindex($2); if (!idx) { fprintf(stderr, "%s is an invalid interface.\n", $2); break; } - conf.channel[conf.channel_num].u.mcast.interface_idx = idx; if (conf.channel[conf.channel_num].u.mcast.ipproto == AF_INET6) { conf.channel[conf.channel_num].u.mcast.ifa.interface_index6 = idx; |