From: Jaroslav Kysela <perex@perex.cz>
Date: Mon, 9 Oct 2017 13:02:10 +0000 (+0200)
Subject: config: don't use http_server_name directly, add config_get_http_server_name()
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c73760dd1cd1a7f944924536d3f1d1a2d74aaeb4;p=thirdparty%2Ftvheadend.git

config: don't use http_server_name directly, add config_get_http_server_name()
---

diff --git a/src/config.c b/src/config.c
index 12423b56f..20c1b56bf 100644
--- a/src/config.c
+++ b/src/config.c
@@ -2458,6 +2458,11 @@ const char *config_get_server_name ( void )
   return tvh_str_default(config.server_name, "Tvheadend");
 }
 
+const char *config_get_http_server_name ( void )
+{
+  return tvh_str_default(config.http_server_name, "HTS/tvheadend");
+}
+
 const char *config_get_language ( void )
 {
   return tvh_str_default(config.language, "eng");
diff --git a/src/config.h b/src/config.h
index ae03dcb90..6524db823 100644
--- a/src/config.h
+++ b/src/config.h
@@ -73,6 +73,7 @@ void        config_init    ( int backup );
 void        config_done    ( void );
 
 const char *config_get_server_name ( void );
+const char *config_get_http_server_name ( void );
 const char *config_get_language    ( void );
 const char *config_get_language_ui ( void );
 
diff --git a/src/http.c b/src/http.c
index eafd30234..d54a05525 100644
--- a/src/http.c
+++ b/src/http.c
@@ -345,7 +345,7 @@ http_send_header(http_connection_t *hc, int rc, const char *content,
 		 http_ver2str(hc->hc_version), rc, http_rc2str(rc));
 
   if (hc->hc_version != RTSP_VERSION_1_0){
-    htsbuf_qprintf(&hdrs, "Server: %s\r\n", config.http_server_name ?: "HTS/tvheadend");
+    htsbuf_qprintf(&hdrs, "Server: %s\r\n", config_get_http_server_name());
     if (config.cors_origin && config.cors_origin[0]) {
       htsbuf_qprintf(&hdrs, "Access-Control-Allow-Origin: %s\r\n", config.cors_origin);
       htsbuf_append_str(&hdrs, "Access-Control-Allow-Methods: POST, GET, OPTIONS\r\n");
diff --git a/src/satip/rtsp.c b/src/satip/rtsp.c
index 3a34e3d42..427c6a229 100644
--- a/src/satip/rtsp.c
+++ b/src/satip/rtsp.c
@@ -1289,8 +1289,7 @@ rtsp_describe_session(session_t *rs, htsbuf_queue_t *q)
   char buf[4096];
 
   htsbuf_qprintf(q, "a=control:stream=%d\r\n", rs->stream);
-  htsbuf_qprintf(q, "a=tool:%s\r\n",
-                    tvh_str_default(config.http_server_name, "HTS/tvheadend"));
+  htsbuf_qprintf(q, "a=tool:%s\r\n", config_get_http_server_name());
   htsbuf_append_str(q, "m=video 0 RTP/AVP 33\r\n");
   if (strchr(rtsp_ip, ':'))
     htsbuf_append_str(q, "c=IN IP6 ::0\r\n");