diff options
| author | guido <guido@FreeBSD.org> | 2005-12-30 11:52:26 +0000 |
|---|---|---|
| committer | guido <guido@FreeBSD.org> | 2005-12-30 11:52:26 +0000 |
| commit | 7ee09247502caaf9063c5d6ba733231a70de09ef (patch) | |
| tree | 9209f38a8bc3af0186363bc8bbfe05d79337f8d4 /contrib/ipfilter/samples | |
| parent | 3cc29e6ebff10906cf1f84a6cc2d518dcecf219c (diff) | |
| download | FreeBSD-src-7ee09247502caaf9063c5d6ba733231a70de09ef.zip FreeBSD-src-7ee09247502caaf9063c5d6ba733231a70de09ef.tar.gz | |
Resolve conflicts (and believe me...you don't want to know).
Diffstat (limited to 'contrib/ipfilter/samples')
| -rw-r--r-- | contrib/ipfilter/samples/proxy.c | 4 | ||||
| -rw-r--r-- | contrib/ipfilter/samples/relay.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/ipfilter/samples/proxy.c b/contrib/ipfilter/samples/proxy.c index c1854b5..fcf000f 100644 --- a/contrib/ipfilter/samples/proxy.c +++ b/contrib/ipfilter/samples/proxy.c @@ -94,8 +94,8 @@ char *argv[]; natlook.nl_outip = sin.sin_addr; natlook.nl_inip = sloc.sin_addr; natlook.nl_flags = IPN_TCP; - natlook.nl_outport = ntohs(sin.sin_port); - natlook.nl_inport = ntohs(sloc.sin_port); + natlook.nl_outport = sin.sin_port; + natlook.nl_inport = sloc.sin_port; /* * Open the NAT device and lookup the mapping pair. diff --git a/contrib/ipfilter/samples/relay.c b/contrib/ipfilter/samples/relay.c index f775cbd..ac5c602 100644 --- a/contrib/ipfilter/samples/relay.c +++ b/contrib/ipfilter/samples/relay.c @@ -18,9 +18,9 @@ #include <sys/ioctl.h> #include <netinet/in.h> #include <net/if.h> -#include "ip_compat.h" -#include "ip_fil.h" -#include "ip_nat.h" +#include "netinet/ip_compat.h" +#include "netinet/ip_fil.h" +#include "netinet/ip_nat.h" #include "netinet/ipl.h" #define RELAY_BUFSZ 8192 |
