Unbreak source and binary compatibility.

We can't change the signature of pcap_remoteact_accept(); add
pcap_remoteact_accept_ex() with the new signature, and have
pcap_remoteact_accept() as a wrapper with the old signature.

2 files changed, 9 insertions, 1 deletions

diff --git a/pcap-rpcap.c b/pcap-rpcap.c
index 6e45c433..61a73957 100644
--- a/pcap-rpcap.c
+++ b/pcap-rpcap.c
@@ -2826,7 +2826,7 @@ error_nodiscard:
  * to implement; we provide some APIs for it that work only with rpcap.
  */
 
-SOCKET pcap_remoteact_accept(const char *address, const char *port, const char *hostlist, char *connectinghost, struct pcap_rmtauth *auth, int uses_ssl, char *errbuf)
+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)
 {
 	/* socket-related variables */
 	struct addrinfo hints;			/* temporary struct to keep settings needed to open the new socket */
@@ -2998,6 +2998,11 @@ SOCKET pcap_remoteact_accept(const char *address, const char *port, const char *
 	return sockctrl;
 }
 
+SOCKET pcap_remoteact_accept(const char *address, const char *port, const char *hostlist, char *connectinghost, struct pcap_rmtauth *auth, char *errbuf)
+{
+	return pcap_remoteact_accept_ex(address, port, hostlist, connectinghost, auth, 0, errbuf);
+}
+
 int pcap_remoteact_close(const char *host, char *errbuf)
 {
 	struct activehosts *temp, *prev;	/* temp var needed to scan the host list chain */
diff --git a/pcap/pcap.h b/pcap/pcap.h
index 571c88c0..8a69a2f3 100644
--- a/pcap/pcap.h
+++ b/pcap/pcap.h
@@ -950,6 +950,9 @@ PCAP_API struct pcap_samp *pcap_setsampling(pcap_t *p);
 
 PCAP_API SOCKET	pcap_remoteact_accept(const char *address, const char *port,
 	    const char *hostlist, char *connectinghost,
+	    struct pcap_rmtauth *auth, char *errbuf);
+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_API int	pcap_remoteact_list(char *hostlist, char sep, int size,
 	    char *errbuf);