From 076792d94b905a3757dee64d3a9b43ebd9f03e30 Mon Sep 17 00:00:00 2001 From: Daniel Collins Date: Sat, 3 Nov 2012 23:13:53 +0000 Subject: [PATCH] Removed IP address fields from router_addr structure. --- src/router.c | 10 ---------- src/router.h | 4 ---- 2 files changed, 14 deletions(-) diff --git a/src/router.c b/src/router.c index 4eab7ac..6ff24e7 100644 --- a/src/router.c +++ b/src/router.c @@ -395,9 +395,6 @@ static int router_bind(struct router_vars *router, SOCKET control, SOCKET sock, if( (sa_netnum == iface->ipx_net || sa_netnum == 0) && (sa_nodenum == iface->ipx_node || sa_nodenum == 0) - - /* TODO: Remove this check. */ - && iface->ipaddr ) { break; } @@ -415,11 +412,6 @@ static int router_bind(struct router_vars *router, SOCKET control, SOCKET sock, addr32_out(addr->sa_netnum, iface->ipx_net); addr48_out(addr->sa_nodenum, iface->ipx_node); - /* TODO: Don't store the IP stuff here. */ - - uint32_t iface_ipaddr = iface->ipaddr->ipaddr; - uint32_t iface_netmask = iface->ipaddr->netmask; - free_ipx_interface_list(&ifaces); EnterCriticalSection(&(router->crit_sec)); @@ -497,8 +489,6 @@ static int router_bind(struct router_vars *router, SOCKET control, SOCKET sock, new_addr->control_socket = control; new_addr->filter_ptype = -1; new_addr->flags = flags; - new_addr->ipaddr = iface_ipaddr; - new_addr->netmask = iface_netmask; new_addr->remote_addr.sa_family = AF_UNSPEC; new_addr->next = router->addrs; diff --git a/src/router.h b/src/router.h index c6f6b48..49ef7bb 100644 --- a/src/router.h +++ b/src/router.h @@ -58,10 +58,6 @@ struct router_addr { int filter_ptype; /* Packet type filter, negative to disable */ int flags; - /* Address of IP interface */ - uint32_t ipaddr; - uint32_t netmask; - /* Only accept packets from this address (any if AF_UNSPEC) */ struct sockaddr_ipx remote_addr;