Merge branch 'master' into pcap-options

diff --cc CMakeLists.txt
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc pcap/pcap.h
index 6c65dc300994df1c4e984d25f55e19da078bcfd9,a4e20f6012f793ea3ba5a29d91c069acd14fb60e..13ebfdbded186dc9d802825bc19f68f94cbf26cd
--- 1/pcap/pcap.h
--- 2/pcap/pcap.h
+++ b/pcap/pcap.h
@@@ -1037,28 -1254,17 +1254,34 @@@ PCAP_AVAILABLE_1_1
  PCAP_API SOCKET       pcap_remoteact_accept_ex(const char *address, const char *port,
            const char *hostlist, char *connectinghost,
            struct pcap_rmtauth *auth, int uses_ssl, char *errbuf);
+ 
+ PCAP_AVAILABLE_1_9
  PCAP_API int  pcap_remoteact_list(char *hostlist, char sep, int size,
            char *errbuf);
+ 
+ PCAP_AVAILABLE_1_9
  PCAP_API int  pcap_remoteact_close(const char *host, char *errbuf);
+ 
+ PCAP_AVAILABLE_1_9
  PCAP_API void pcap_remoteact_cleanup(void);
  
 +enum pcap_option_name {  /* never renumber this */
 +                     PON_TSTAMP_PRECISION = 1,  /* int */
 +                     PON_IO_READ_PLUGIN   = 2,  /* char * */
 +                     PON_IO_WRITE_PLUGIN  = 3,  /* char * */
 +};
 +typedef struct pcap_options pcap_options;
 +PCAP_API pcap_options *pcap_alloc_option(void);
 +PCAP_API void pcap_free_option(pcap_options *po);
 +PCAP_API int pcap_set_option_string(pcap_options *po,
 +                                  enum pcap_option_name pon, const char *value);
 +PCAP_API int pcap_set_option_int(pcap_options *po,
 +                               enum pcap_option_name pon, const int value);
 +PCAP_API const char *pcap_get_option_string(pcap_options *po, enum pcap_option_name pon);
 +PCAP_API int pcap_get_option_int(pcap_options *po, enum pcap_option_name pon);
 +
 +
 +
  #ifdef __cplusplus
  }
  #endif