[raop] Move config into new airplay_shared block

forked-daapd.conf.in

@@ -29,10 +29,6 @@ general {
 	# Websocket port for the web interface.
 #	websocket_port = 3688
 
-        # Ports for airplay raop server
-#       raop_control_port = 0
-#       raop_timing_port = 0
-
 	# Sets who is allowed to connect without authorisation. This applies to
 	# client types like Remotes, DAAP clients (iTunes) and to the web
 	# interface. Options are "any", "localhost" or the prefix to one or
@@ -280,6 +276,15 @@ audio {
 #	path = "/path/to/fifo"
 #}
 
+# AirPlay/Airport Express settings
+# common to all devices
+#airplay_shared {
+        # UDP ports used when ariplay devices make connections back to forked-daapd
+        # (choosing specific ports may be helpful when running forked-daapd behind a firewall)
+#       control_port = 0
+#       timing_port = 0
+#}
+
 # AirPlay/Airport Express device settings
 # (make sure you get the capitalization of the device name right)
 #airplay "My AirPlay device" {

src/conffile.c

@@ -50,8 +50,6 @@ static cfg_opt_t sec_general[] =
     CFG_INT_CB("loglevel", E_LOG, CFGF_NONE, &cb_loglevel),
     CFG_STR("admin_password", NULL, CFGF_NONE),
     CFG_INT("websocket_port", 3688, CFGF_NONE),
-    CFG_INT("raop_control_port", 0, CFGF_NONE),
-    CFG_INT("raop_timing_port", 0, CFGF_NONE),
     CFG_STR_LIST("trusted_networks", "{localhost,192.168,fd}", CFGF_NONE),
     CFG_BOOL("ipv6", cfg_true, CFGF_NONE),
     CFG_STR("cache_path", STATEDIR "/cache/" PACKAGE "/cache.db", CFGF_NONE),
@@ -139,6 +137,14 @@ static cfg_opt_t sec_alsa[] =
     CFG_END()
   };
 
+/* AirPlay/ApEx share section structure */
+static cfg_opt_t sec_airplay_shared[] =
+  {
+    CFG_INT("control_port", 0, CFGF_NONE),
+    CFG_INT("timing_port", 0, CFGF_NONE),
+    CFG_END()
+  };
+
 /* AirPlay/ApEx device section structure */
 static cfg_opt_t sec_airplay[] =
   {
@@ -217,6 +223,7 @@ static cfg_opt_t toplvl_cfg[] =
     CFG_SEC("library", sec_library, CFGF_NONE),
     CFG_SEC("audio", sec_audio, CFGF_NONE),
     CFG_SEC("alsa", sec_alsa, CFGF_MULTI | CFGF_TITLE),
+    CFG_SEC("airplay_shared", sec_airplay_shared, CFGF_NONE),
     CFG_SEC("airplay", sec_airplay, CFGF_MULTI | CFGF_TITLE),
     CFG_SEC("chromecast", sec_chromecast, CFGF_MULTI | CFGF_TITLE),
     CFG_SEC("fifo", sec_fifo, CFGF_NONE),

src/outputs/raop.c

@@ -3093,7 +3093,7 @@ raop_v2_timing_start_one(struct raop_service *svc, int family)
   memset(&sa, 0, sizeof(union sockaddr_all));
   sa.ss.ss_family = family;
 
-  timing_port = cfg_getint(cfg_getsec(cfg, "general"), "raop_timing_port");
+  timing_port = cfg_getint(cfg_getsec(cfg, "airplay_shared"), "timing_port");
   switch (family)
     {
       case AF_INET:
@@ -3347,7 +3347,7 @@ raop_v2_control_start_one(struct raop_service *svc, int family)
   memset(&sa, 0, sizeof(union sockaddr_all));
   sa.ss.ss_family = family;
 
-  control_port = cfg_getint(cfg_getsec(cfg, "general"), "raop_control_port");
+  control_port = cfg_getint(cfg_getsec(cfg, "airplay_shared"), "control_port");
   switch (family)
     {
       case AF_INET: