[sr-dev] git:5.4:eec7d261: rtpproxy: renamed extract_mediaip() to rp_extract_mediaip()

Daniel-Constantin Mierla miconda at gmail.com
Mon Oct 12 10:17:02 CEST 2020


Module: kamailio
Branch: 5.4
Commit: eec7d2613489613725b8979ce3d00d6616bb80c8
URL: https://github.com/kamailio/kamailio/commit/eec7d2613489613725b8979ce3d00d6616bb80c8

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Daniel-Constantin Mierla <miconda at gmail.com>
Date: 2020-10-12T10:13:59+02:00

rtpproxy: renamed extract_mediaip() to rp_extract_mediaip()

- extract_mediaip() is also in core sdp parser

(cherry picked from commit 8d0044770e94eaf7099eabbb55abe177e52e5373)

---

Modified: src/modules/rtpproxy/rtpproxy.c

---

Diff:  https://github.com/kamailio/kamailio/commit/eec7d2613489613725b8979ce3d00d6616bb80c8.diff
Patch: https://github.com/kamailio/kamailio/commit/eec7d2613489613725b8979ce3d00d6616bb80c8.patch

---

diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c
index 8aef20019f..23c8357e4b 100644
--- a/src/modules/rtpproxy/rtpproxy.c
+++ b/src/modules/rtpproxy/rtpproxy.c
@@ -114,7 +114,7 @@ static str DEFAULT_RTPP_SET_ID_STR = str_init("0");
 #define	PTL_CPROTOVER	"20081102"
 
 #define	CPORT		"22222"
-static int extract_mediaip(str *, str *, int *, char *);
+static int rp_extract_mediaip(str *, str *, int *, char *);
 static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int);
 static int alter_mediaport(struct sip_msg *, str *, str *, str *, int);
 static int alter_rtcp(struct sip_msg *msg, str *body, str *oldport, str *newport);
@@ -958,7 +958,7 @@ replace_sdp_ip(struct sip_msg* msg, str *org_body, char *line, str *ip)
 	}
 	body1 = body;
 	for(;;) {
-		if (extract_mediaip(&body1, &oldip, &pf,line) == -1)
+		if (rp_extract_mediaip(&body1, &oldip, &pf,line) == -1)
 			break;
 		if (pf != AF_INET) {
 			LM_ERR("not an IPv4 address in '%s' SDP\n",line);
@@ -988,7 +988,7 @@ replace_sdp_ip(struct sip_msg* msg, str *org_body, char *line, str *ip)
 }
 
 	static int
-extract_mediaip(str *body, str *mediaip, int *pf, char *line)
+rp_extract_mediaip(str *body, str *mediaip, int *pf, char *line)
 {
 	char *cp, *cp1;
 	int len, nextisip;




More information about the sr-dev mailing list