mrpdclient API change: application need not to know the mrpd socket port number

- The applications make no use of this port number other than pass it
  to mrpdclient_init().
- The mrpd daemon communication socket port is hardcoded.

This port number should  be transparent to applications.

5 files changed, 7 insertions, 8 deletions

diff --git a/examples/mrp_client/mrpValidate.c b/examples/mrp_client/mrpValidate.c
index a341ecf6..91b0f45c 100644
--- a/examples/mrp_client/mrpValidate.c
+++ b/examples/mrp_client/mrpValidate.c
@@ -440,7 +440,7 @@ main(int argc, char *argv[]) {
 		return -1;
 	}
 
-	rc = mrpdclient_init(MRPD_PORT_DEFAULT);
+	rc = mrpdclient_init();
 	if (rc) {
 		printf("init failed\n");
 		goto out;
diff --git a/examples/mrp_client/mrpdclient.c b/examples/mrp_client/mrpdclient.c
index 4c3d13ac..5e20ab84 100644
--- a/examples/mrp_client/mrpdclient.c
+++ b/examples/mrp_client/mrpdclient.c
@@ -57,13 +57,13 @@ static struct timeval rcv_timeout = {
 };
 #endif
 
+#include "mrpd.h"
 #include "mrpdclient.h"
 
 /* global variables */
 static SOCKET control_socket = SOCKET_ERROR;
-static int udp_port = 0;
 
-int mrpdclient_init(int port)
+int mrpdclient_init(void)
 {
 	struct sockaddr_in addr;
 	int rc;
@@ -90,7 +90,6 @@ int mrpdclient_init(int port)
 	if (rc <= SOCKET_ERROR)
 		goto out;
 
-	udp_port = port;
 	return (0);
 
  out:
@@ -135,7 +134,7 @@ int mrpdclient_sendto(char *notify_data, int notify_len)
 
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
-	addr.sin_port = htons(udp_port);
+	addr.sin_port = htons(MRPD_PORT_DEFAULT);
 	addr.sin_addr.s_addr = inet_addr("127.0.0.1");
 	addr_len = sizeof(addr);
 
diff --git a/examples/mrp_client/mrpdclient.h b/examples/mrp_client/mrpdclient.h
index c8a1d20f..0c472ca0 100644
--- a/examples/mrp_client/mrpdclient.h
+++ b/examples/mrp_client/mrpdclient.h
@@ -39,7 +39,7 @@
 
 typedef int (*ptr_process_msg) (char *buf, int buflen);
 
-int mrpdclient_init(int port);
+int mrpdclient_init(void);
 int mrpdclient_recv(ptr_process_msg fn);
 int mrpdclient_sendto(char *notify_data, int notify_len);
 int mrpdclient_close(void);
diff --git a/examples/mrp_client/mrpl.c b/examples/mrp_client/mrpl.c
index 9b32af6b..92bee1a7 100755
--- a/examples/mrp_client/mrpl.c
+++ b/examples/mrp_client/mrpl.c
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
 	if (optind < argc)
 		usage();
 
-	rc = mrpdclient_init(MRPD_PORT_DEFAULT);
+	rc = mrpdclient_init();
 	if (rc) {
 		printf("init failed\n");
 		return -1;
diff --git a/examples/mrp_client/mrpq.c b/examples/mrp_client/mrpq.c
index 111f9fa5..59c634a8 100755
--- a/examples/mrp_client/mrpq.c
+++ b/examples/mrp_client/mrpq.c
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
 
 	printf("%s\n", version_str);
 
-	rc = mrpdclient_init(MRPD_PORT_DEFAULT);
+	rc = mrpdclient_init();
 	if (rc) {
 		printf("init failed\n");
 		return -1;