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 12423b56f42af941b32ad65c2c74ace2893382d1..20c1b56bf4dc1e6601a1af9d75742b84ee2e6fbd 100644 (file)
--- 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 ae03dcb9090521092336069a9f04069687eff6a1..6524db823ac57eaab2e75626715bc5dcc512a955 100644 (file)
--- 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 eafd3023428f87cb42ea0c9f35eddfe5c9784dc2..d54a055255888f873b6ce6bcdf5b628a70d1b48c 100644 (file)
--- 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 3a34e3d42987c9d6e1ee2ddcff829b23869158b6..427c6a229bb67e61262aad7f547ebacf44e5043f 100644 (file)
--- 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");