Merge branch 'master' into libconfig

Author: lminiero

Makefile.am

@@ -44,7 +44,7 @@ confdir = $(sysconfdir)/janus
 conf_DATA = conf/janus.jcfg.sample
 
 certdir = $(datadir)/janus/certs
-cert_DATA = certs/mycert.key certs/mycert.pem
+dist_cert_DATA = certs/mycert.key certs/mycert.pem
 
 plugindir = $(libdir)/janus/plugins
 plugin_LTLIBRARIES = $(NULL)
@@ -56,7 +56,7 @@ eventdir = $(libdir)/janus/events
 event_LTLIBRARIES = $(NULL)
 
 SUBDIRS = html
-html_DATA = README.md
+dist_html_DATA = README.md
 
 streamdir = $(datadir)/janus/streams
 stream_DATA = $(NULL)
@@ -168,7 +168,7 @@ janus_LDADD = \
 	$(JANUS_MANUAL_LIBS) \
 	$(NULL)
 
-man1_MANS = janus.1
+dist_man1_MANS = janus.1
 
 bin_PROGRAMS += janus-cfgconv
 
@@ -190,10 +190,12 @@ janus_cfgconv_LDADD = \
 	$(JANUS_MANUAL_LIBS) \
 	$(NULL)
 
-man1_MANS += janus-cfgconv.1
+dist_man1_MANS += janus-cfgconv.1
 
 BUILT_SOURCES = cmdline.c cmdline.h version.c
 
+cmdline.h: cmdline.c
+
 cmdline.c: janus.c
 	gengetopt --set-package="janus" --set-version="$(VERSION)" < janus.ggo
 
@@ -333,6 +335,16 @@ conf_DATA += conf/janus.eventhandler.rabbitmqevh.jcfg.sample
 EXTRA_DIST += conf/janus.eventhandler.rabbitmqevh.jcfg.sample
 endif
 
+if ENABLE_MQTTEVH
+event_LTLIBRARIES += events/libjanus_mqttevh.la
+events_libjanus_mqttevh_la_SOURCES = events/janus_mqttevh.c
+events_libjanus_mqttevh_la_CFLAGS = $(events_cflags)
+events_libjanus_mqttevh_la_LDFLAGS = $(events_ldflags) -lpaho-mqtt3as
+events_libjanus_mqttevh_la_LIBADD = $(events_libadd)
+conf_DATA += conf/janus.eventhandler.mqttevh.cfg.sample
+EXTRA_DIST += conf/janus.eventhandler.mqttevh.cfg.sample
+endif
+
 ##
 # Plugins
 ##
@@ -511,7 +523,6 @@ endif
 
 if ENABLE_POST_PROCESSING
 bin_PROGRAMS += janus-pp-rec
-man1_MANS += postprocessing/janus-pp-rec.1
 
 janus_pp_rec_SOURCES = \
 	postprocessing/pp-g711.c \
@@ -542,6 +553,7 @@ janus_pp_rec_LDADD = \
 	$(POST_PROCESSING_LIBS) \
 	$(NULL)
 endif
+dist_man1_MANS += postprocessing/janus-pp-rec.1
 
 ##
 # Docs
@@ -557,28 +569,22 @@ endif
 
 if ENABLE_JAVASCRIPT_ES_MODULE
 jsmodules_DATA += npm/bundles/janus.es.js
-EXTRA_DIST += npm/bundles/janus.es.js
-CLEANFILES += npm/bundles/janus.es.js
 endif
 
 if ENABLE_JAVASCRIPT_UMD_MODULE
 jsmodules_DATA += npm/bundles/janus.umd.js
-EXTRA_DIST += npm/bundles/janus.umd.js
-CLEANFILES += npm/bundles/janus.umd.js
 endif
 
 if ENABLE_JAVASCRIPT_IIFE_MODULE
 jsmodules_DATA += npm/bundles/janus.iife.js
-EXTRA_DIST += npm/bundles/janus.iife.js
-CLEANFILES += npm/bundles/janus.iife.js
 endif
 
 if ENABLE_JAVASCRIPT_COMMON_JS_MODULE
 jsmodules_DATA += npm/bundles/janus.cjs.js
-EXTRA_DIST += npm/bundles/janus.cjs.js
-CLEANFILES += npm/bundles/janus.cjs.js
 endif
 
+EXTRA_DIST += $(jsmodules_DATA)
+
 if ENABLE_JAVASCRIPT_MODULES
 
 npm/node_modules/rollup/bin/rollup: npm/package.json

README.md

@@ -22,7 +22,7 @@ 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/)
+* [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)
 * [usrsctp](https://github.com/sctplab/usrsctp) (only needed if you
@@ -34,9 +34,9 @@ you are interested in WebSockets support for the Janus API)
 * [cmake](http://www.cmake.org/) (only needed if you are interested in
 WebSockets and/or BoringSSL support, as they make use of it)
 * [rabbitmq-c](https://github.com/alanxz/rabbitmq-c) (only needed if
-you are interested in RabbitMQ support for the Janus API)
+you are interested in RabbitMQ support for the Janus API or events)
 * [paho.mqtt.c](https://eclipse.org/paho/clients/c) (only needed if
-you are interested in MQTT support for the Janus API)
+you are interested in MQTT support for the Janus API or events)
 * [nanomsg](https://nanomsg.org/) (only needed if
 you are interested in Nanomsg support for the Janus API)
 * [libcurl](https://curl.haxx.se/libcurl/) (only needed if you are
@@ -81,10 +81,16 @@ On Ubuntu or Debian, it would require something like this:
 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).
 
-* *Note:* For custom installations of libnice, you can run
-`pkg-config --cflags --libs nice` to make sure Janus can find the
-installation. If not, you may need to set the `PKG_CONFIG_PATH`
-environment variable prior to compiling Janus, eg.
+* *Note:* We always recommend the master version of libnice (or even the
+experimental patch that optimize its performances), or at the very least
+version 0.1.13, which should be available out of the box on most distros.
+If you're on an older version, consider upgrading it manually as they're
+known to cause trouble. Ideally, you'll want to remove the distro version
+and install the newer one manually. In case you want to keep both for
+some reason, for custom installations of libnice, you can run
+`pkg-config --cflags --libs nice` to make sure Janus can find the right
+installation. If that fails, you may need to set the `PKG_CONFIG_PATH`
+environment variable prior to compiling Janus, e.g.,
 `export PKG_CONFIG_PATH=/path/to/libnice/lib/pkgconfig`
 
 In case you're interested in compiling the sample Event Handler plugin,
@@ -188,9 +194,9 @@ the first line with this:
 
 The same applies for Eclipse Paho MQTT C client library, which is needed
 for the optional MQTT support. If you're interested in integrating MQTT
-queues as an alternative (or replacement) to HTTP and/or WebSockets
-to control Janus, you can install the latest version with the
-following steps:
+channels as an alternative (or replacement) to HTTP and/or WebSockets
+to control Janus, or as a carrier of Janus Events, you can install the
+latest version with the following steps:
 
 	git clone https://github.com/eclipse/paho.mqtt.c.git
 	cd paho.mqtt.c
@@ -326,7 +332,7 @@ or on the command line:
 
 	<installdir>/bin/janus --help
 
-	janus 0.4.4
+	janus 0.4.5
 
 	Usage: janus [OPTIONS]...
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "janus-gateway",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "homepage": "https://github.com/meetecho/janus-gateway",
   "authors": [
     "Lorenzo Miniero <[email protected]>",

conf/janus.eventhandler.mqttevh.cfg.sample

@@ -0,0 +1,39 @@
+; This configures the MQTT event handler. Events are sent either on
+; one topic or on a topic per event type.
+;
+; By default, configuration topics for handle and webrtc event types
+; with the base topic are configured to /janus/events, e.g.:
+;	/janus/events/handle
+;	/janus/events/webrtc
+
+[general]
+enabled = no			; By default the module is not enabled
+events = all			; Comma separated list of the events mask you're interested
+						; in. Valid values are none, sessions, handles, jsep, webrtc,
+						; media, plugins, transports, core, external and all. By
+						; default we subscribe to everything (all)
+json = indented			; Whether the JSON messages should be indented (default),
+						; plain (no indentation) or compact (no indentation and no spaces)
+
+url = tcp://localhost:1883		; The URL of the MQTT server. Only tcp supported at this time.
+client_id = janus.example.com	; Janus client id. You have to configure a unique ID.
+;keep_alive_interval = 20		; Keep connection for N seconds (default: 30)
+;cleansession = 0				; Clean session flag (default: off)
+;mqtt_qos = 1					; Default MQTT QoS for published events
+;disconnect_timeout = 100		; Seconds to wait before destroying client
+;username = guest				; Username for authentication (default: no authentication)
+;password = guest				; Password for authentication (default: no authentication)
+;topic=/janus/events			; Base topic (default: /janus/events)
+;addtype = yes					; Whether we should add the event type to the base topic
+
+
+; Additional parameters if "mqtts://" schema is used
+;tls_verify_peer = yes			; Whether peer verification must be enabled
+;tls_verify_hostname = yes		; Whether hostname verification must be enabled
+
+; Certificates to use when SSL support is enabled, if needed
+;tls_cacert = /path/to/cacert.pem
+;tls_client_cert = /path/to/cert.pem
+;tls_client_key = /path/to/key.pem
+;tls_ciphers
+;tls_version

conf/janus.eventhandler.rabbitmqevh.jcfg.sample

@@ -9,6 +9,9 @@ general: {
 	grouping = true					# Whether events should be sent individually , or if it's ok
 									# to group them. The default is 'yes' to limit the number of
 									# messages
+	json = "indented"				# Whether the JSON messages should be indented (default),
+									# plain (no indentation) or compact (no indentation and no spaces)
+
 	host = "localhost"				# The address of the RabbitMQ server
 	#port = 5672					# The port of the RabbitMQ server (5672 by default)
 	#username = "guest"				# Username to use to authenticate, if needed

conf/janus.eventhandler.sampleevh.jcfg.sample

@@ -18,6 +18,9 @@ general: {
 						# requests with an application/json payload. In case
 						# authentication is required to contact the backend, set
 						# the credentials as well (basic authentication only).
+	json = "indented"	# Whether the JSON messages should be indented (default),
+						# plain (no indentation) or compact (no indentation and no spaces)
+
 	backend = "http://your.webserver.here/and/a/path"
 	#backend_user = "myuser"
 	#backend_pwd = "mypwd"

conf/janus.jcfg.sample.in

@@ -99,14 +99,20 @@ certificates: {
 # starting MTU for DTLS (1200 by default, it adapts automatically), and
 # finally how much time, in seconds, should pass with no media (audio or
 # video) being received before Janus notifies you about this (default=1s,
-# 0 disables these events entirely).
+# 0 disables these events entirely). Finally, if you're using BoringSSL
+# you can customize the frequency of retransmissions: OpenSSL has a fixed
+# value of 1 second (the default), while BoringSSL can override that. Notice
+# that lower values (e.g., 100ms) will typically get you faster connection
+# times, but may not work in case the RTT of the user is high: as such,
+# you should pick a reasonable trade-off (usually 2*max expected RTT).
 media: {
 	#ipv6 = true
 	#max_nack_queue = 500
 	#rfc_4588 = true
 	#rtp_port_range = "20000-40000"
 	#dtls_mtu = 1200
 	#no_media_timer = 1
+	#dtls_timeout = 500
 }
 
 # NAT-related stuff: specifically, you can configure the STUN/TURN
@@ -139,8 +145,8 @@ nat: {
 	# all host candidates (which normally have a private IP address) to
 	# be rewritten with the public address provided in the settings. As
 	# such, use the option with caution and only if you know what you're doing.
-	# Besides, it's still recommended to also enable STUN in those cases,
-	# and keep ICE Lite disabled as it's not strictly speaking a public server.
+	# Make sure you keep ICE Lite disabled, though, as it's not strictly
+	# speaking a publicly reachable server, and a NAT is still involved.
 	#nat_1_1_mapping = "1.2.3.4"
 
 	# You can configure a TURN server in two different ways: specifying a

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([Janus WebRTC Server],[0.4.4],[https://github.com/meetecho/janus-gateway],[janus-gateway],[https://janus.conf.meetecho.com])
+AC_INIT([Janus WebRTC Server],[0.4.5],[https://github.com/meetecho/janus-gateway],[janus-gateway],[https://janus.conf.meetecho.com])
 AC_CONFIG_AUX_DIR([.])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -15,9 +15,9 @@ AC_PROG_CC
 LT_PREREQ([2.2])
 LT_INIT
 
-JANUS_VERSION=44
+JANUS_VERSION=45
 AC_SUBST(JANUS_VERSION)
-JANUS_VERSION_STRING="0.4.4"
+JANUS_VERSION_STRING="0.4.5"
 AC_SUBST(JANUS_VERSION_STRING)
 
 case "$host_os" in
@@ -142,6 +142,8 @@ AC_ARG_ENABLE([all-handlers],
                      [enable_sample_event_handler=no])
                AS_IF([test "x$enable_rabbitmq_event_handler" != "xyes"],
                      [enable_rabbitmq_event_handler=no])
+               AS_IF([test "x$enable_mqtt_event_handler" != "xyes"],
+                     [enable_mqtt_event_handler=no])
               ],
               [])
 
@@ -212,6 +214,13 @@ AC_ARG_ENABLE([rabbitmq-event-handler],
                      [enable_rabbitmq_event_handler=no])],
               [enable_rabbitmq_event_handler=maybe])
 
+AC_ARG_ENABLE([mqtt-event-handler],
+              [AS_HELP_STRING([--disable-mqtt-event-handler],
+                              [Disable MQTT event handler ])],
+              [AS_IF([test "x$enable_mqtt_event_handler" != "xyes"],
+                     [enable_mqtt_event_handler=no])],
+              [enable_mqtt_event_handler=maybe])
+
 AC_ARG_ENABLE([systemd-sockets],
               [AS_HELP_STRING([--enable-systemd-sockets],
                               [Enable Systemd Unix Sockets management])],
@@ -451,7 +460,6 @@ AC_CHECK_LIB([rabbitmq],
                  AC_DEFINE(HAVE_RABBITMQEVH)
                  enable_rabbitmq_event_handler=yes
                ])
-
              ],
              [
                AS_IF([test "x$enable_rabbitmq" = "xyes"],
@@ -467,10 +475,17 @@ AC_CHECK_LIB([paho-mqtt3a],
                   AC_DEFINE(HAVE_MQTT)
                   enable_mqtt=yes
                ])
+               AS_IF([test "x$enable_mqtt_event_handler" != "xno"],
+               [
+                 AC_DEFINE(HAVE_MQTTEVH)
+                 enable_mqtt_event_handler=yes
+               ])
              ],
              [
                AS_IF([test "x$enable_mqtt" = "xyes"],
                      [AC_MSG_ERROR([paho c client not found. See README.md for installation instructions or use --disable-mqtt])])
+               AS_IF([test "x$enable_mqtt_event_handler" = "xyes"],
+                     [AC_MSG_ERROR([paho c not found. See README.md for installation instructions or use --disable-mqtt-event-handler])])
              ])
 AC_CHECK_LIB([nanomsg],
              [nn_socket],
@@ -488,6 +503,7 @@ AC_CHECK_LIB([nanomsg],
 AM_CONDITIONAL([ENABLE_RABBITMQ], [test "x$enable_rabbitmq" = "xyes"])
 AM_CONDITIONAL([ENABLE_RABBITMQEVH], [test "x$enable_rabbitmq_event_handler" = "xyes"])
 AM_CONDITIONAL([ENABLE_MQTT], [test "x$enable_mqtt" = "xyes"])
+AM_CONDITIONAL([ENABLE_MQTTEVH], [test "x$enable_mqtt_event_handler" = "xyes"])
 AM_CONDITIONAL([ENABLE_NANOMSG], [test "x$enable_nanomsg" = "xyes"])
 
 AC_TRY_COMPILE([
@@ -522,7 +538,7 @@ AS_IF([test "x$enable_systemd_sockets" = "xyes"],
                           [AC_MSG_ERROR([libsystemd not found. systemd unix domain socket service not supported])])
       ])
 
- 
+
 ##
 # Plugins
 ##
@@ -928,6 +944,9 @@ AM_COND_IF([ENABLE_SAMPLEEVH],
 AM_COND_IF([ENABLE_RABBITMQEVH],
 	[echo "    RabbitMQ event handler:yes"],
 	[echo "    RabbitMQ event handler:no"])
+AM_COND_IF([ENABLE_MQTTEVH],
+	[echo "    MQTT event handler:    yes"],
+	[echo "    MQTT event handler:    no"])
 AM_COND_IF([ENABLE_JAVASCRIPT_MODULES], [
 	echo "JavaScript modules:        yes"
 	echo "    Using npm:             $NPM"

docs/janus-doxygen.cfg

@@ -32,7 +32,7 @@ PROJECT_NAME           = "Janus"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.4.4
+PROJECT_NUMBER         = 0.4.5
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer