From: jneubrand <johannes_n@icloud.com>
Date: Thu, 24 Nov 2016 19:41:51 +0000 (-0800)
Subject: Fix ClientIP info in metadata
X-Git-Tag: 3.0~5^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F429%2Fhead;p=thirdparty%2Fshairport-sync.git

Fix ClientIP info in metadata
Metadata was previously reporting server ip as client ip "ssnc-clip".
Fixed by:
- providing remote_ip data instead of ip data for metadata in rtsp.c
- continuing export of ip data under "ssnc-svip" metadata tag
---

diff --git a/rtsp.c b/rtsp.c
index feb11c27..38b07453 100644
--- a/rtsp.c
+++ b/rtsp.c
@@ -1954,7 +1954,8 @@ void rtsp_listen_loop(void) {
           inet_ntop(AF_INET, &(sa->sin_addr), remote_ip4, INET_ADDRSTRLEN);
           unsigned short int rport = ntohs(sa->sin_port);
 #ifdef CONFIG_METADATA
-        	send_ssnc_metadata('clip', strdup(ip4), strlen(ip4) , 1);
+        	send_ssnc_metadata('clip', strdup(remote_ip4), strlen(remote_ip4) , 1);
+        	send_ssnc_metadata('svip', strdup(ip4), strlen(ip4) , 1);
 #endif
 
           debug(1,"New RTSP connection from %s:%u to self at %s:%u.",remote_ip4,rport,ip4,tport);
@@ -1973,7 +1974,8 @@ void rtsp_listen_loop(void) {
           inet_ntop(AF_INET6, &(sa6->sin6_addr), remote_ip6, INET6_ADDRSTRLEN);
           u_int16_t rport = ntohs(sa6->sin6_port);
 #ifdef CONFIG_METADATA
-        	send_ssnc_metadata('clip', strdup(ip6), strlen(ip6), 1);
+        	send_ssnc_metadata('clip', strdup(remote_ip6), strlen(remote_ip6), 1);
+        	send_ssnc_metadata('svip', strdup(ip6), strlen(ip6), 1);
 #endif
           debug(1,"New RTSP connection from [%s]:%u to self at [%s]:%u.",remote_ip6,rport,ip6,tport);
         }