From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 18 Sep 2017 19:03:20 +0000 (+0200)
Subject: satip server: fixed the RTP TCP size initialization, fixes #4517
X-Git-Tag: v4.2.4~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89155d9ffe0fc7cd227474dfbf8e22071b5e022e;p=thirdparty%2Ftvheadend.git

satip server: fixed the RTP TCP size initialization, fixes #4517
---

diff --git a/src/config.c b/src/config.c
index ae2137a00..f61b32418 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1682,6 +1682,8 @@ config_boot ( const char *path, gid_t gid, uid_t uid )
 
   idclass_register(&config_class);
 
+  satip_server_boot();
+
   /* Generate default */
   if (!path) {
     const char *homedir = getenv("HOME");
diff --git a/src/satip/server.c b/src/satip/server.c
index 6ed6636e0..901d1389c 100644
--- a/src/satip/server.c
+++ b/src/satip/server.c
@@ -925,16 +925,20 @@ static void satip_server_save(void)
  * Initialization
  */
 
-void satip_server_init(const char *bindaddr, int rtsp_port)
+void satip_server_boot(void)
 {
-  pthread_mutex_init(&satip_server_reinit, NULL);
-
   idclass_register(&satip_server_class);
 
-  http_server_ip = NULL;
   satip_server_bootid = time(NULL);
   satip_server_conf.satip_deviceid = 1;
   satip_server_conf.satip_rtptcpsize = 7896/188;
+}
+
+void satip_server_init(const char *bindaddr, int rtsp_port)
+{
+  pthread_mutex_init(&satip_server_reinit, NULL);
+
+  http_server_ip = NULL;
 
   satip_server_bindaddr = bindaddr ? strdup(bindaddr) : NULL;
   satip_server_rtsp_port_locked = rtsp_port > 0;
diff --git a/src/satip/server.h b/src/satip/server.h
index ddb42e2a3..b7f99aaa2 100644
--- a/src/satip/server.h
+++ b/src/satip/server.h
@@ -100,6 +100,7 @@ int satip_server_http_page(http_connection_t *hc,
 
 int satip_server_match_uuid(const char *uuid);
 
+void satip_server_boot(void);
 void satip_server_init(const char *bindaddr, int rtsp_port);
 void satip_server_register(void);
 void satip_server_done(void);
@@ -110,6 +111,7 @@ static inline int satip_server_match_uuid(const char *uuid) { return 0; }
 
 static inline void satip_server_config_changed(void) { };
 
+static inline void satip_server_boot(void) { };
 static inline void satip_server_init(const char *bindaddr, int rtsp_port) { };
 static inline void satip_server_register(void) { };
 static inline void satip_server_done(void) { };