diff options
| -rw-r--r-- | rpcap-protocol.c | 5 | ||||
| -rw-r--r-- | rpcap-protocol.h | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/rpcap-protocol.c b/rpcap-protocol.c index b0a9652a..07e25602 100644 --- a/rpcap-protocol.c +++ b/rpcap-protocol.c @@ -40,12 +40,9 @@ #include <stdarg.h> /* for functions with variable number of arguments */ #include <errno.h> /* for the errno variable */ #include "sockutils.h" +#include "portability.h" #include "rpcap-protocol.h" #include <pcap/pcap.h> -#if 0 -#include "pcap-rpcap.h" -#include "pcap-rpcap-int.h" -#endif /* * This file contains functions used both by the rpcap client and the diff --git a/rpcap-protocol.h b/rpcap-protocol.h index caf6abc3..be6cf2f1 100644 --- a/rpcap-protocol.h +++ b/rpcap-protocol.h @@ -34,9 +34,6 @@ #ifndef __RPCAP_PROTOCOL_H__ #define __RPCAP_PROTOCOL_H__ -#include "portability.h" -#include <pcap/funcattrs.h> - #define RPCAP_DEFAULT_NETPORT "2002" /* Default port on which the RPCAP daemon is waiting for connections. */ /* Default port on which the client workstation is waiting for connections in case of active mode. */ #define RPCAP_DEFAULT_NETPORT_ACTIVE "2003" @@ -327,6 +324,9 @@ struct rpcap_sampling * Routines used by the rpcap client and rpcap daemon * * * *********************************************************/ + +#include "sockutils.h" + extern int rpcap_checkver(SOCKET sock, struct rpcap_header *header, char *errbuf); extern void rpcap_createhdr(struct rpcap_header *header, uint8 type, uint16 value, uint32 length); extern int rpcap_checkmsg(char *errbuf, SOCKET sock, struct rpcap_header *header, uint8 first, ...); |