commit 557b1ab15b3a404397e4e728702eb5d0ae33c4e6
author Holger Hans Peter Freyther <zecke@selfish.org> Sun Sep 19 04:39:55 2010 +0800
committer Holger Hans Peter Freyther <zecke@selfish.org> Mon Sep 20 02:51:30 2010 +0800
tree 4d2cbc4a12cb7a85339a6044c35d8dc0b2f48753
parent f2eedff052bd7f92655a32d5a57206018b310aec

mgcp: Remove code duplication for filling out the sockaddr_in

Share the send to transcoder sockaddr sending routines.

openbsc/src/mgcp/mgcp_protocol.c

diff --git a/openbsc/src/mgcp/mgcp_protocol.c b/openbsc/src/mgcp/mgcp_protocol.c
index 5abdeae..d1699e1 100644
--- a/openbsc/src/mgcp/mgcp_protocol.c
+++ b/openbsc/src/mgcp/mgcp_protocol.c
@@ -864,10 +864,21 @@
 	return endpoint + 60;
 }
 
+static int send_trans(struct mgcp_config *cfg, const char *buf, int len)
+{
+	struct sockaddr_in addr;
+
+	memset(&addr, 0, sizeof(addr));
+	addr.sin_family = AF_INET;
+	addr.sin_addr = cfg->transcoder_in;
+	addr.sin_port = htons(2427);
+	return sendto(cfg->gw_fd.bfd.fd, buf, len, 0,
+		      (struct sockaddr *) &addr, sizeof(addr));
+}
+
 static void send_msg(struct mgcp_endpoint *endp, int endpoint, int port,
 		     const char *msg, const char *mode)
 {
-	struct sockaddr_in addr;
 	char buf[2096];
 	int len;
 
@@ -889,17 +900,11 @@
 
 	buf[sizeof(buf) - 1] = '\0';
 
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_family = AF_INET;
-	addr.sin_addr = endp->cfg->transcoder_in;
-	addr.sin_port = htons(2427);
-	sendto(endp->cfg->gw_fd.bfd.fd, buf, len, 0,
-	       (struct sockaddr *) &addr, sizeof(addr));
+	send_trans(endp->cfg, buf, len);
 }
 
 static void send_dlcx(struct mgcp_endpoint *endp, int endpoint)
 {
-	struct sockaddr_in addr;
 	char buf[2096];
 	int len;
 
@@ -913,12 +918,7 @@
 
 	buf[sizeof(buf) - 1] = '\0';
 
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_family = AF_INET;
-	addr.sin_addr = endp->cfg->transcoder_in;
-	addr.sin_port = htons(2427);
-	sendto(endp->cfg->gw_fd.bfd.fd, buf, len, 0,
-	       (struct sockaddr *) &addr, sizeof(addr));
+	send_trans(endp->cfg, buf, len);
 }
 
 static void create_transcoder(struct mgcp_endpoint *endp)
@@ -954,8 +954,6 @@
 
 int mgcp_reset_transcoder(struct mgcp_config *cfg)
 {
-	struct sockaddr_in addr;
-
 	if (!cfg->transcoder_ip)
 		return -1;
 
@@ -963,10 +961,5 @@
 	    "RSIP 1 13@mgw MGCP 1.0\r\n"
 	};
 
-	memset(&addr, 0, sizeof(addr));
-	addr.sin_family = AF_INET;
-	addr.sin_addr = cfg->transcoder_in;
-	addr.sin_port = htons(2427);
-	return sendto(cfg->gw_fd.bfd.fd, mgcp_reset, sizeof mgcp_reset -1, 0,
-		      (struct sockaddr *) &addr, sizeof(addr));
+	return send_trans(cfg, mgcp_reset, sizeof mgcp_reset -1);
 }