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

diff --git a/src/config.c b/src/config.c
index ae2137a00d6452fb62580108fe2776f53c13acff..f61b32418c753bcfd5c9389024280095cc9e70fd 100644 (file)
--- 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 6ed6636e02b05b746312cd19389dc37df3bb5b40..901d1389c393e29a007ee1566409c2a3e36118ee 100644 (file)
--- 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 ddb42e2a33a9c864609e573cbfa8f5a650723c18..b7f99aaa25762e42af9c7c08f8540c760dfbe90f 100644 (file)
--- 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) { };