backup/ipxwrapper
1
0
Fork 0
mirror of https://github.com/solemnwarning/ipxwrapper synced 2024-12-30 16:45:37 +01:00
Code Issues Projects Releases Activity

Removed IP address fields from router_addr structure.

Browse Source
This commit is contained in:
Daniel Collins 2012-11-03 23:13:53 +00:00
parent 2dd19ce6d7
commit 076792d94b
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/router.c
View File

@ -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;

4
src/router.h
View File

@ -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;