diff -Nur nsat/Makefile ../new/nsat/Makefile
diff -Nur nsat/src/AuditSet.h ../new/nsat/src/AuditSet.h
--- nsat/src/AuditSet.h	2001-06-13 20:08:58.000000000 -0400
+++ ../new/nsat/src/AuditSet.h	2006-07-07 09:56:37.000000000 -0400
@@ -45,7 +45,7 @@
 
   unsigned int sl;		// sizeof peer
 
-  unsigned int target;		// current host
+  long target;		// current host
 
   int timeout;			// connect timeout
 
diff -Nur nsat/src/libmix++/mix/lmconfig.h ../new/nsat/src/libmix++/mix/lmconfig.h
--- nsat/src/libmix++/mix/lmconfig.h	1969-12-31 19:00:00.000000000 -0500
+++ ../new/nsat/src/libmix++/mix/lmconfig.h	2006-07-07 09:15:50.000000000 -0400
@@ -0,0 +1,187 @@
+/* src/libmix++/mix/lmconfig.h.  Generated automatically by configure.  */
+/* src/libmix++/mix/lmconfig.h.in.  Generated automatically from configure.in by autoheader.  */
+#define HAVE_LINUX 1
+/* #undef HAVE_BSD */
+/* #undef HAVE_SOLARIS */
+#define MY_HDRINCL 3
+
+/* Define if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define if you have the <ctype.h> header file. */
+#define HAVE_CTYPE_H 1
+
+/* Define if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* Define if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define if you have the `initstate' function. */
+#define HAVE_INITSTATE 1
+
+/* Define if you have the <inttypes.h> header file. */
+/* #undef HAVE_INTTYPES_H */
+
+/* Define if you have the `pcap' library (-lpcap). */
+#define HAVE_LIBPCAP 1
+
+/* Define if you have the <memory.h> header file. */
+/* #undef HAVE_MEMORY_H */
+
+/* Define if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define if you have the <netinet/in_systm.h> header file. */
+#define HAVE_NETINET_IN_SYSTM_H 1
+
+/* Define if you have the <netinet/ip.h> header file. */
+#define HAVE_NETINET_IP_H 1
+
+/* Define if you have the <netinet/ip_icmp.h> header file. */
+#define HAVE_NETINET_IP_ICMP_H 1
+
+/* Define if you have the <netinet/ip_var.h> header file. */
+/* #undef HAVE_NETINET_IP_VAR_H */
+
+/* Define if you have the <net/if.h> header file. */
+#define HAVE_NET_IF_H 1
+
+/* Define if you have the `random' function. */
+#define HAVE_RANDOM 1
+
+/* Define if you have the `select' function. */
+#define HAVE_SELECT 1
+
+/* Define if you have the `setsockopt' function. */
+#define HAVE_SETSOCKOPT 1
+
+/* Define if you have the <signal.h> header file. */
+#define HAVE_SIGNAL_H 1
+
+/* Define if you have the `snprintf' function. */
+#define HAVE_SNPRINTF 1
+
+/* Define if you have the `socket' function. */
+#define HAVE_SOCKET 1
+
+/* Define if you have the `srandom' function. */
+#define HAVE_SRANDOM 1
+
+/* Define if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
+/* Define if you have the <stdint.h> header file. */
+/* #undef HAVE_STDINT_H */
+
+/* Define if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the <std_args.h> header file. */
+/* #undef HAVE_STD_ARGS_H */
+
+/* Define if you have the `strdup' function. */
+#define HAVE_STRDUP 1
+
+/* Define if you have the `strerror' function. */
+#define HAVE_STRERROR 1
+
+/* Define if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define if you have the <string.h> header file. */
+/* #undef HAVE_STRING_H */
+
+/* Define if you have the `strstr' function. */
+#define HAVE_STRSTR 1
+
+/* Define if you have the <sys/bufmod.h> header file. */
+/* #undef HAVE_SYS_BUFMOD_H */
+
+/* Define if you have the <sys/dlpi.h> header file. */
+/* #undef HAVE_SYS_DLPI_H */
+
+/* Define if you have the <sys/file.h> header file. */
+#define HAVE_SYS_FILE_H 1
+
+/* Define if you have the <sys/filio.h> header file. */
+/* #undef HAVE_SYS_FILIO_H */
+
+/* Define if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define if you have the <sys/resource.h> header file. */
+#define HAVE_SYS_RESOURCE_H 1
+
+/* Define if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define if you have the <sys/signal.h> header file. */
+#define HAVE_SYS_SIGNAL_H 1
+
+/* Define if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define if you have the <sys/stat.h> header file. */
+/* #undef HAVE_SYS_STAT_H */
+
+/* Define if you have the <sys/stream.h> header file. */
+/* #undef HAVE_SYS_STREAM_H */
+
+/* Define if you have the <sys/stropts.h> header file. */
+#define HAVE_SYS_STROPTS_H 1
+
+/* Define if you have the <sys/termios.h> header file. */
+#define HAVE_SYS_TERMIOS_H 1
+
+/* Define if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define if you have the <X11/Xlib.h> header file. */
+/* #undef HAVE_X11_XLIB_H */
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define if the `setpgrp' function takes no argument. */
+#define SETPGRP_VOID 1
+
+/* Define if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Define if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define if your <sys/time.h> declares `struct tm'. */
+/* #undef TM_IN_SYS_TIME */
+
+/* Define if your processor stores words with the most significant byte first
+   (like Motorola and SPARC, unlike Intel and VAX). */
+/* #undef WORDS_BIGENDIAN */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Define to `unsigned' if <sys/types.h> does not define. */
+/* #undef size_t */
diff -Nur nsat/src/libmix++/mix/net.h ../new/nsat/src/libmix++/mix/net.h
--- nsat/src/libmix++/mix/net.h	1969-12-31 19:00:00.000000000 -0500
+++ ../new/nsat/src/libmix++/mix/net.h	2006-07-07 09:15:50.000000000 -0400
@@ -0,0 +1,165 @@
+#ifndef NET_H
+#define NET_H
+
+#include "lmconfig.h"
+
+#ifdef WORDS_BIGENDIAN
+#undef WORDS_BIGENDIAN	/* this is a little endian machine */
+#endif
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include "aes.h"
+#include "misc.h"
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifndef INADDR_ANY
+#define INADDR_ANY              ((unsigned) 0x00000000)
+#endif
+
+typedef char s8;
+typedef unsigned char u8;
+typedef short int s16;
+typedef unsigned short int u16;
+typedef int s32;
+typedef unsigned int u32;
+
+#if defined(WORDS_BIGENDIAN) && !defined(htons) && !defined(htonl)
+#define ntohl(x)        (x)
+#define ntohs(x)        (x)
+#define htonl(x)        (x)
+#define htons(x)        (x)
+#endif
+
+/* IP protocols, common */
+#define P_IP 0
+#define P_ICMP 1
+#define P_IGMP 2
+#define P_TCP 6
+#define P_UDP 17
+#define P_RAW 255
+
+#define M_SIN   16
+#define M_ETH   14
+#define M_IP    20
+#define M_ICMP   8
+#define M_TCP   20
+#define M_UDP    8
+
+struct sa
+  {
+    u16 fam, dp;
+    u32 add;
+    u8 zero[8];
+  };
+
+struct su
+  {
+    u16 fam;
+    char path[108];
+  };
+
+struct eth
+{
+ unsigned char dst[6];
+ unsigned char src[6];
+ unsigned short proto;
+};
+
+#define ETHALL          0x0003
+#define ETHIP           0x0800
+
+struct lmip
+  {
+#ifndef WORDS_BIGENDIAN
+    u8 ihl:4, ver:4;
+#else
+    u8 ver:4, ihl:4;
+#endif
+    u8 tos;
+    u16 tl, id, off;
+    u8 ttl, pro;
+    u16 sum;
+    u32 src, dst;
+  };
+
+struct lmtcp
+  {
+    u16 src, dst;
+    u32 seq, ack;
+#ifndef WORDS_BIGENDIAN
+    u8 x2:4, off:4;
+#else
+    u8 off:4, x2:4;
+#endif
+    u8 flg;			/* flag1 | flag2 */
+#define FIN  0x01
+#define SYN  0x02
+#define RST  0x04
+#define PUSH 0x08
+#define ACK  0x10
+#define URG  0x20
+    u16 win, sum, urp;
+  };
+
+struct lmtcp2
+  {
+    u16 src, dst;
+    u32 seq, ackseq;
+#ifndef WORDS_BIGENDIAN
+    u16 res1:4;
+    u16 doff:4;
+    u16 fin:1;
+    u16 syn:1;
+    u16 rst:1;
+    u16 psh:1;
+    u16 ack:1;
+    u16 urg:1;
+    u16 res2:2;
+#else
+    u16 doff:4;
+    u16 res1:4;
+    u16 res2:2;
+    u16 urg:1;
+    u16 ack:1;
+    u16 psh:1;
+    u16 rst:1;
+    u16 syn:1;
+    u16 fin:1;
+#endif
+    u16 win, sum, urp;
+  };
+
+struct lmudp
+  {
+    u16 src, dst, len, sum;
+  };
+
+struct lmicmp
+  {
+    u8 type, code;
+    u16 sum;
+    u16 id, seq;
+  };
+
+struct tribe
+  {
+    char start, id, end;
+  };
+
+#endif
diff -Nur nsat/src/mod/xp_icmp_addrmask.c ../new/nsat/src/mod/xp_icmp_addrmask.c
--- nsat/src/mod/xp_icmp_addrmask.c	2002-01-21 13:28:46.000000000 -0500
+++ ../new/nsat/src/mod/xp_icmp_addrmask.c	2006-07-07 10:09:09.000000000 -0400
@@ -27,7 +27,7 @@
 rpack_t *send_icmpmaskreq_req(struct sockaddr_in to) {
 
     int sndsock, rcvsock;
-    int res;
+    ssize_t res;
     struct protoent *pe;
     struct sockaddr_in from;
     struct ip *ip, *rcv_ip;
diff -Nur nsat/src/mod/xp_icmp_echo.c ../new/nsat/src/mod/xp_icmp_echo.c
--- nsat/src/mod/xp_icmp_echo.c	2002-02-07 12:14:20.000000000 -0500
+++ ../new/nsat/src/mod/xp_icmp_echo.c	2006-07-07 10:03:10.000000000 -0400
@@ -31,7 +31,7 @@
 rpack_t *send_icmpecho_var_req(struct sockaddr_in to, int bits) {
 
     int sndsock;
-    int res;
+    ssize_t res;
     struct ip *ip;
     struct icmp *icmp;
     unsigned char *pack, *recv_pack;
diff -Nur nsat/src/mod/xp_icmp_infr.c ../new/nsat/src/mod/xp_icmp_infr.c
--- nsat/src/mod/xp_icmp_infr.c	2002-02-07 12:14:20.000000000 -0500
+++ ../new/nsat/src/mod/xp_icmp_infr.c	2006-07-07 10:05:04.000000000 -0400
@@ -27,7 +27,7 @@
 rpack_t *send_icmpireq_req(struct sockaddr_in to) {
 
     int sndsock;
-    int res;
+    ssize_t res;
     struct ip *ip;
     struct icmp *icmp;
     unsigned char *pack, *recv_pack;
diff -Nur nsat/src/mod/xp_icmp_timestamp.c ../new/nsat/src/mod/xp_icmp_timestamp.c
--- nsat/src/mod/xp_icmp_timestamp.c	2002-01-21 13:28:46.000000000 -0500
+++ ../new/nsat/src/mod/xp_icmp_timestamp.c	2006-07-07 10:08:51.000000000 -0400
@@ -27,7 +27,7 @@
 rpack_t *send_icmpts_req(struct sockaddr_in to) {
 
     int sndsock, rcvsock;
-    int res;
+    ssize_t res;
     struct protoent *pe;
     struct sockaddr_in from;
     struct ip *ip, *rcv_ip;
diff -Nur nsat/src/mod/xp_udp_probe.c ../new/nsat/src/mod/xp_udp_probe.c
--- nsat/src/mod/xp_udp_probe.c	2002-02-07 12:14:20.000000000 -0500
+++ ../new/nsat/src/mod/xp_udp_probe.c	2006-07-07 10:05:49.000000000 -0400
@@ -34,7 +34,7 @@
 rpack_t *send_udp(struct sockaddr_in to) {
 
     int sndsock;
-    int res;
+    ssize_t res;
     int port;
     struct ip *ip;
     struct udphdr *udp;