New configuration file format (using libconfig)

.gitignore

@@ -4,6 +4,7 @@ version.c
 docs/html/
 
 /janus
+/janus-cfgconv
 /janus-pp-rec
 /plugins/*.so
 /transports/*.so
@@ -53,6 +54,14 @@ Makefile.in
 /conf/janus.plugin.voicemail.cfg.sample
 /conf/janus.transport.http.cfg.sample
 /conf/janus.transport.websockets.cfg.sample
+/conf/janus.jcfg.sample
+/conf/janus.plugin.duktape.jcfg.sample
+/conf/janus.plugin.lua.jcfg.sample
+/conf/janus.plugin.recordplay.jcfg.sample
+/conf/janus.plugin.streaming.jcfg.sample
+/conf/janus.plugin.voicemail.jcfg.sample
+/conf/janus.transport.http.jcfg.sample
+/conf/janus.transport.websockets.jcfg.sample
 
 .deps
 .dirstamp

Makefile.am

@@ -41,7 +41,7 @@ eventsheaderdir = $(includedir)/janus/events
 eventsheader_HEADERS = events/eventhandler.h
 
 confdir = $(sysconfdir)/janus
-conf_DATA = conf/janus.cfg.sample
+conf_DATA = conf/janus.jcfg.sample
 
 certdir = $(datadir)/janus/certs
 dist_cert_DATA = certs/mycert.key certs/mycert.pem
@@ -91,8 +91,8 @@ jsmodules_DATA = html/janus.js
 	    s|[@]duktapedir[@]|$(duktapedir)|" \
 	$< > $@ || rm $@
 
-EXTRA_DIST += conf/janus.cfg.sample.in
-CLEANFILES += conf/janus.cfg.sample
+EXTRA_DIST += conf/janus.jcfg.sample.in
+CLEANFILES += conf/janus.jcfg.sample
 
 ##
 # Janus
@@ -170,6 +170,28 @@ janus_LDADD = \
 
 dist_man1_MANS = janus.1
 
+bin_PROGRAMS += janus-cfgconv
+
+janus_cfgconv_SOURCES = \
+	janus-cfgconv.c \
+	config.c \
+	log.c \
+	utils.c \
+	version.c \
+	$(NULL)
+
+janus_cfgconv_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(JANUS_CFLAGS) \
+	$(NULL)
+
+janus_cfgconv_LDADD = \
+	$(JANUS_LIBS) \
+	$(JANUS_MANUAL_LIBS) \
+	$(NULL)
+
+dist_man1_MANS += janus-cfgconv.1
+
 BUILT_SOURCES = cmdline.c cmdline.h version.c
 
 cmdline.h: cmdline.c
@@ -224,9 +246,9 @@ transports_libjanus_http_la_SOURCES = transports/janus_http.c
 transports_libjanus_http_la_CFLAGS = $(transports_cflags) $(MHD_CFLAGS)
 transports_libjanus_http_la_LDFLAGS = $(transports_ldflags) $(MHD_LDFLAGS) $(MHD_LIBS)
 transports_libjanus_http_la_LIBADD = $(transports_libadd) $(MHD_LDFLAGS)
-conf_DATA += conf/janus.transport.http.cfg.sample
-EXTRA_DIST += conf/janus.transport.http.cfg.sample.in
-CLEANFILES += conf/janus.transport.http.cfg.sample
+conf_DATA += conf/janus.transport.http.jcfg.sample
+EXTRA_DIST += conf/janus.transport.http.jcfg.sample.in
+CLEANFILES += conf/janus.transport.http.jcfg.sample
 endif
 
 if ENABLE_WEBSOCKETS
@@ -235,9 +257,9 @@ transports_libjanus_websockets_la_SOURCES = transports/janus_websockets.c
 transports_libjanus_websockets_la_CFLAGS = $(transports_cflags)
 transports_libjanus_websockets_la_LDFLAGS = $(transports_ldflags) $(WS_MANUAL_LIBS)
 transports_libjanus_websockets_la_LIBADD = $(transports_libadd)
-conf_DATA += conf/janus.transport.websockets.cfg.sample
-EXTRA_DIST += conf/janus.transport.websockets.cfg.sample.in
-CLEANFILES += conf/janus.transport.websockets.cfg.sample
+conf_DATA += conf/janus.transport.websockets.jcfg.sample
+EXTRA_DIST += conf/janus.transport.websockets.jcfg.sample.in
+CLEANFILES += conf/janus.transport.websockets.jcfg.sample
 endif
 
 if ENABLE_RABBITMQ
@@ -246,8 +268,8 @@ transports_libjanus_rabbitmq_la_SOURCES = transports/janus_rabbitmq.c
 transports_libjanus_rabbitmq_la_CFLAGS = $(transports_cflags)
 transports_libjanus_rabbitmq_la_LDFLAGS = $(transports_ldflags) -lrabbitmq
 transports_libjanus_rabbitmq_la_LIBADD = $(transports_libadd)
-conf_DATA += conf/janus.transport.rabbitmq.cfg.sample
-EXTRA_DIST += conf/janus.transport.rabbitmq.cfg.sample
+conf_DATA += conf/janus.transport.rabbitmq.jcfg.sample
+EXTRA_DIST += conf/janus.transport.rabbitmq.jcfg.sample
 endif
 
 if ENABLE_MQTT
@@ -256,8 +278,8 @@ transports_libjanus_mqtt_la_SOURCES = transports/janus_mqtt.c
 transports_libjanus_mqtt_la_CFLAGS = $(transports_cflags)
 transports_libjanus_mqtt_la_LDFLAGS = $(transports_ldflags) -lpaho-mqtt3as
 transports_libjanus_mqtt_la_LIBADD = $(transports_libadd)
-conf_DATA += conf/janus.transport.mqtt.cfg.sample
-EXTRA_DIST += conf/janus.transport.mqtt.cfg.sample
+conf_DATA += conf/janus.transport.mqtt.jcfg.sample
+EXTRA_DIST += conf/janus.transport.mqtt.jcfg.sample
 endif
 
 if ENABLE_PFUNIX
@@ -266,8 +288,8 @@ transports_libjanus_pfunix_la_SOURCES = transports/janus_pfunix.c
 transports_libjanus_pfunix_la_CFLAGS = $(transports_cflags)
 transports_libjanus_pfunix_la_LDFLAGS = $(transports_ldflags) $(LIBSYSTEMD_LIBS)
 transports_libjanus_pfunix_la_LIBADD = $(transports_libadd)
-conf_DATA += conf/janus.transport.pfunix.cfg.sample
-EXTRA_DIST += conf/janus.transport.pfunix.cfg.sample
+conf_DATA += conf/janus.transport.pfunix.jcfg.sample
+EXTRA_DIST += conf/janus.transport.pfunix.jcfg.sample
 endif
 
 if ENABLE_NANOMSG
@@ -276,8 +298,8 @@ transports_libjanus_nanomsg_la_SOURCES = transports/janus_nanomsg.c
 transports_libjanus_nanomsg_la_CFLAGS = $(transports_cflags)
 transports_libjanus_nanomsg_la_LDFLAGS = $(transports_ldflags) -lnanomsg
 transports_libjanus_nanomsg_la_LIBADD = $(transports_libadd)
-conf_DATA += conf/janus.transport.nanomsg.cfg.sample
-EXTRA_DIST += conf/janus.transport.nanomsg.cfg.sample
+conf_DATA += conf/janus.transport.nanomsg.jcfg.sample
+EXTRA_DIST += conf/janus.transport.nanomsg.jcfg.sample
 endif
 
 ##
@@ -299,8 +321,8 @@ events_libjanus_sampleevh_la_SOURCES = events/janus_sampleevh.c
 events_libjanus_sampleevh_la_CFLAGS = $(events_cflags)
 events_libjanus_sampleevh_la_LDFLAGS = $(events_ldflags) -lcurl
 events_libjanus_sampleevh_la_LIBADD = $(events_libadd)
-conf_DATA += conf/janus.eventhandler.sampleevh.cfg.sample
-EXTRA_DIST += conf/janus.eventhandler.sampleevh.cfg.sample
+conf_DATA += conf/janus.eventhandler.sampleevh.jcfg.sample
+EXTRA_DIST += conf/janus.eventhandler.sampleevh.jcfg.sample
 endif
 
 if ENABLE_RABBITMQEVH
@@ -309,8 +331,8 @@ events_libjanus_rabbitmqevh_la_SOURCES = events/janus_rabbitmqevh.c
 events_libjanus_rabbitmqevh_la_CFLAGS = $(events_cflags)
 events_libjanus_rabbitmqevh_la_LDFLAGS = $(events_ldflags) -lrabbitmq
 events_libjanus_rabbitmqevh_la_LIBADD = $(events_libadd)
-conf_DATA += conf/janus.eventhandler.rabbitmqevh.cfg.sample
-EXTRA_DIST += conf/janus.eventhandler.rabbitmqevh.cfg.sample
+conf_DATA += conf/janus.eventhandler.rabbitmqevh.jcfg.sample
+EXTRA_DIST += conf/janus.eventhandler.rabbitmqevh.jcfg.sample
 endif
 
 if ENABLE_MQTTEVH
@@ -342,8 +364,8 @@ plugins_libjanus_audiobridge_la_SOURCES = plugins/janus_audiobridge.c
 plugins_libjanus_audiobridge_la_CFLAGS = $(plugins_cflags) $(OPUS_CFLAGS)
 plugins_libjanus_audiobridge_la_LDFLAGS = $(plugins_ldflags) $(OPUS_LDFLAGS) $(OPUS_LIBS)
 plugins_libjanus_audiobridge_la_LIBADD = $(plugins_libadd) $(OPUS_LIBADD)
-conf_DATA += conf/janus.plugin.audiobridge.cfg.sample
-EXTRA_DIST += conf/janus.plugin.audiobridge.cfg.sample
+conf_DATA += conf/janus.plugin.audiobridge.jcfg.sample
+EXTRA_DIST += conf/janus.plugin.audiobridge.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_ECHOTEST
@@ -352,8 +374,8 @@ plugins_libjanus_echotest_la_SOURCES = plugins/janus_echotest.c
 plugins_libjanus_echotest_la_CFLAGS = $(plugins_cflags)
 plugins_libjanus_echotest_la_LDFLAGS = $(plugins_ldflags)
 plugins_libjanus_echotest_la_LIBADD = $(plugins_libadd)
-conf_DATA += conf/janus.plugin.echotest.cfg.sample
-EXTRA_DIST += conf/janus.plugin.echotest.cfg.sample
+conf_DATA += conf/janus.plugin.echotest.jcfg.sample
+EXTRA_DIST += conf/janus.plugin.echotest.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_RECORDPLAY
@@ -362,15 +384,15 @@ plugins_libjanus_recordplay_la_SOURCES = plugins/janus_recordplay.c
 plugins_libjanus_recordplay_la_CFLAGS = $(plugins_cflags)
 plugins_libjanus_recordplay_la_LDFLAGS = $(plugins_ldflags)
 plugins_libjanus_recordplay_la_LIBADD = $(plugins_libadd)
-conf_DATA += conf/janus.plugin.recordplay.cfg.sample
+conf_DATA += conf/janus.plugin.recordplay.jcfg.sample
 recordings_DATA += \
 	plugins/recordings/1234.nfo \
 	plugins/recordings/rec-sample-audio.mjr \
 	plugins/recordings/rec-sample-video.mjr
 EXTRA_DIST += \
-	conf/janus.plugin.recordplay.cfg.sample.in \
+	conf/janus.plugin.recordplay.jcfg.sample.in \
 	$(recordings_DATA)
-CLEANFILES += conf/janus.plugin.recordplay.cfg.sample
+CLEANFILES += conf/janus.plugin.recordplay.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_SIP
@@ -379,8 +401,8 @@ plugins_libjanus_sip_la_SOURCES = plugins/janus_sip.c
 plugins_libjanus_sip_la_CFLAGS = $(plugins_cflags) $(SOFIA_CFLAGS)
 plugins_libjanus_sip_la_LDFLAGS = $(plugins_ldflags) $(SOFIA_LDFLAGS) $(SOFIA_LIBS)
 plugins_libjanus_sip_la_LIBADD = $(plugins_libadd) $(SOFIA_LIBADD)
-conf_DATA += conf/janus.plugin.sip.cfg.sample
-EXTRA_DIST += conf/janus.plugin.sip.cfg.sample
+conf_DATA += conf/janus.plugin.sip.jcfg.sample
+EXTRA_DIST += conf/janus.plugin.sip.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_SIPRE
@@ -389,8 +411,8 @@ plugins_libjanus_sipre_la_SOURCES = plugins/janus_sipre.c
 plugins_libjanus_sipre_la_CFLAGS = $(plugins_cflags) $(LIBRE_CFLAGS)
 plugins_libjanus_sipre_la_LDFLAGS = $(plugins_ldflags) $(LIBRE_LDFLAGS) $(LIBRE_LIBS)
 plugins_libjanus_sipre_la_LIBADD = $(plugins_libadd) $(LIBRE_LIBADD)
-conf_DATA += conf/janus.plugin.sipre.cfg.sample
-EXTRA_DIST += conf/janus.plugin.sipre.cfg.sample
+conf_DATA += conf/janus.plugin.sipre.jcfg.sample
+EXTRA_DIST += conf/janus.plugin.sipre.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_NOSIP
@@ -399,8 +421,8 @@ plugins_libjanus_nosip_la_SOURCES = plugins/janus_nosip.c
 plugins_libjanus_nosip_la_CFLAGS = $(plugins_cflags)
 plugins_libjanus_nosip_la_LDFLAGS = $(plugins_ldflags)
 plugins_libjanus_nosip_la_LIBADD = $(plugins_libadd)
-conf_DATA += conf/janus.plugin.nosip.cfg.sample
-EXTRA_DIST += conf/janus.plugin.nosip.cfg.sample
+conf_DATA += conf/janus.plugin.nosip.jcfg.sample
+EXTRA_DIST += conf/janus.plugin.nosip.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_STREAMING
@@ -409,16 +431,16 @@ plugins_libjanus_streaming_la_SOURCES = plugins/janus_streaming.c
 plugins_libjanus_streaming_la_CFLAGS = $(plugins_cflags)
 plugins_libjanus_streaming_la_LDFLAGS = $(plugins_ldflags)
 plugins_libjanus_streaming_la_LIBADD = $(plugins_libadd)
-conf_DATA += conf/janus.plugin.streaming.cfg.sample
+conf_DATA += conf/janus.plugin.streaming.jcfg.sample
 stream_DATA += \
 	plugins/streams/music.mulaw \
 	plugins/streams/radio.alaw \
 	plugins/streams/test_gstreamer.sh \
 	plugins/streams/test_gstreamer_1.sh
 EXTRA_DIST += \
-	conf/janus.plugin.streaming.cfg.sample.in \
+	conf/janus.plugin.streaming.jcfg.sample.in \
 	$(stream_DATA)
-CLEANFILES += conf/janus.plugin.streaming.cfg.sample
+CLEANFILES += conf/janus.plugin.streaming.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_VIDEOCALL
@@ -427,8 +449,8 @@ plugins_libjanus_videocall_la_SOURCES = plugins/janus_videocall.c
 plugins_libjanus_videocall_la_CFLAGS = $(plugins_cflags)
 plugins_libjanus_videocall_la_LDFLAGS = $(plugins_ldflags)
 plugins_libjanus_videocall_la_LIBADD = $(plugins_libadd)
-conf_DATA += conf/janus.plugin.videocall.cfg.sample
-EXTRA_DIST += conf/janus.plugin.videocall.cfg.sample
+conf_DATA += conf/janus.plugin.videocall.jcfg.sample
+EXTRA_DIST += conf/janus.plugin.videocall.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_VIDEOROOM
@@ -437,8 +459,8 @@ plugins_libjanus_videoroom_la_SOURCES = plugins/janus_videoroom.c
 plugins_libjanus_videoroom_la_CFLAGS = $(plugins_cflags)
 plugins_libjanus_videoroom_la_LDFLAGS = $(plugins_ldflags)
 plugins_libjanus_videoroom_la_LIBADD = $(plugins_libadd)
-conf_DATA += conf/janus.plugin.videoroom.cfg.sample
-EXTRA_DIST += conf/janus.plugin.videoroom.cfg.sample
+conf_DATA += conf/janus.plugin.videoroom.jcfg.sample
+EXTRA_DIST += conf/janus.plugin.videoroom.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_VOICEMAIL
@@ -447,9 +469,9 @@ plugins_libjanus_voicemail_la_SOURCES = plugins/janus_voicemail.c
 plugins_libjanus_voicemail_la_CFLAGS = $(plugins_cflags)
 plugins_libjanus_voicemail_la_LDFLAGS = $(plugins_ldflags) -logg
 plugins_libjanus_voicemail_la_LIBADD = $(plugins_libadd)
-conf_DATA += conf/janus.plugin.voicemail.cfg.sample
-EXTRA_DIST += conf/janus.plugin.voicemail.cfg.sample.in
-CLEANFILES += conf/janus.plugin.voicemail.cfg.sample
+conf_DATA += conf/janus.plugin.voicemail.jcfg.sample
+EXTRA_DIST += conf/janus.plugin.voicemail.jcfg.sample.in
+CLEANFILES += conf/janus.plugin.voicemail.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_TEXTROOM
@@ -458,8 +480,8 @@ plugins_libjanus_textroom_la_SOURCES = plugins/janus_textroom.c
 plugins_libjanus_textroom_la_CFLAGS = $(plugins_cflags)
 plugins_libjanus_textroom_la_LDFLAGS = $(plugins_ldflags)
 plugins_libjanus_textroom_la_LIBADD = $(plugins_libadd)
-conf_DATA += conf/janus.plugin.textroom.cfg.sample
-EXTRA_DIST += conf/janus.plugin.textroom.cfg.sample
+conf_DATA += conf/janus.plugin.textroom.jcfg.sample
+EXTRA_DIST += conf/janus.plugin.textroom.jcfg.sample
 endif
 
 if ENABLE_PLUGIN_LUA
@@ -468,13 +490,13 @@ plugins_libjanus_lua_la_SOURCES = plugins/janus_lua.c plugins/janus_lua_data.h p
 plugins_libjanus_lua_la_CFLAGS = $(plugins_cflags) $(LUA_CFLAGS)
 plugins_libjanus_lua_la_LDFLAGS = $(plugins_ldflags) $(LUA_LDFLAGS) $(LUA_LIBS)
 plugins_libjanus_lua_la_LIBADD = $(plugins_libadd) $(LUA_LIBADD)
-conf_DATA += conf/janus.plugin.lua.cfg.sample
+conf_DATA += conf/janus.plugin.lua.jcfg.sample
 lua_DATA += \
 	plugins/lua/echotest.lua \
 	plugins/lua/videoroom.lua \
 	plugins/lua/janus-logger.lua \
 	plugins/lua/janus-sdp.lua
-EXTRA_DIST += conf/janus.plugin.lua.cfg.sample.in
+EXTRA_DIST += conf/janus.plugin.lua.jcfg.sample.in
 endif
 
 if ENABLE_PLUGIN_DUKTAPE
@@ -487,11 +509,11 @@ plugins_libjanus_duktape_la_SOURCES = plugins/janus_duktape.c \
 plugins_libjanus_duktape_la_CFLAGS = $(plugins_cflags) $(DUKTAPE_CFLAGS)
 plugins_libjanus_duktape_la_LDFLAGS = $(plugins_ldflags) $(DUKTAPE_LDFLAGS) $(DUKTAPE_LIBS)
 plugins_libjanus_duktape_la_LIBADD = $(plugins_libadd) $(DUKTAPE_LIBADD)
-conf_DATA += conf/janus.plugin.duktape.cfg.sample
+conf_DATA += conf/janus.plugin.duktape.jcfg.sample
 duktape_DATA += \
 	plugins/duktape/echotest.js \
 	plugins/duktape/janus-sdp.js
-EXTRA_DIST += conf/janus.plugin.duktape.cfg.sample.in
+EXTRA_DIST += conf/janus.plugin.duktape.jcfg.sample.in
 endif
 
 

README.md

@@ -12,6 +12,7 @@ To discuss Janus with us and other users, there's a Google Group called [meetech
 To install it, you'll need to satisfy the following dependencies:
 
 * [Jansson](http://www.digip.org/jansson/)
+* [libconfig](https://hyperrealm.github.io/libconfig/)
 * [libnice](http://nice.freedesktop.org/wiki/) (at least v0.1.13 suggested, master recommended)
 * [OpenSSL](http://www.openssl.org/) (at least v1.0.1e)
 * [libsrtp](https://github.com/cisco/libsrtp) (at least v1.5 suggested)
@@ -42,8 +43,8 @@ All of those libraries are usually available on most of the most common distribu
 
     yum install libmicrohttpd-devel jansson-devel \
        openssl-devel libsrtp-devel sofia-sip-devel glib-devel \
-       opus-devel libogg-devel libcurl-devel lua-devel \
-       pkgconfig gengetopt libtool autoconf automake
+       opus-devel libogg-devel libcurl-devel pkgconfig gengetopt \
+       libconfig-devel libtool autoconf automake
 
 Notice that you may have to `yum install epel-release` as well if you're attempting an installation on a CentOS machine instead.
 
@@ -52,7 +53,7 @@ On Ubuntu or Debian, it would require something like this:
 	aptitude install libmicrohttpd-dev libjansson-dev \
 		libssl-dev libsrtp-dev libsofia-sip-ua-dev libglib2.0-dev \
 		libopus-dev libogg-dev libcurl4-openssl-dev liblua5.3-dev \
-		pkg-config gengetopt libtool automake
+		libconfig-dev pkg-config gengetopt libtool automake
 
 * *Note:* please notice that libopus may not be available out of the box on Ubuntu or Debian, unless you're using a recent version (e.g., Ubuntu 14.04 LTS). In that case, you'll have to [install it manually](http://www.opus-codec.org).
 
@@ -213,8 +214,8 @@ While most of the above instructions will work when compiling Janus on MacOS as
 First of all, you can use `brew` to install most of the dependencies:
 
 	brew install jansson libnice openssl srtp libusrsctp libmicrohttpd \
-		libwebsockets cmake rabbitmq-c sofia-sip opus libogg curl \
-		glib pkg-config gengetopt autoconf automake libtool
+		libwebsockets cmake rabbitmq-c sofia-sip opus libogg curl glib \
+		libconfig pkg-config gengetopt autoconf automake libtool
 
 For what concerns libwebsockets, though, make sure that the installed version is higher than `2.4.1`, or you might encounter the problems described in [this post](https://groups.google.com/forum/#!topic/meetecho-janus/HsFaEXBz4Cg). If `brew` doesn't provide a more recent version, you'll have to install the library manually.