[Pkg-voip-commits] [janus] 151/282: Merge branch 'master' into iceloop-sessions-mgmt

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.2.6-1
in repository janus.

commit 3826d1670b737e13ef23e711976c8e178a1dde12
Merge: fed839f b8fd04c
Author: Alessandro Toppi <atoppi at meetecho.com>
Date:   Tue Oct 24 17:13:26 2017 +0200

    Merge branch 'master' into iceloop-sessions-mgmt

 Makefile.am                              |   68 +-
 README.md                                |    2 +-
 conf/janus.plugin.audiobridge.cfg.sample |   10 +
 conf/janus.plugin.nosip.cfg.sample       |   10 +
 conf/janus.plugin.sip.cfg.sample         |    4 +
 conf/janus.plugin.sipre.cfg.sample       |   16 +
 conf/janus.plugin.videoroom.cfg.sample   |    5 +
 configure.ac                             |  133 +-
 docs/doxy-boot.js                        |    2 +
 docs/janus-doxygen.cfg                   |    2 +-
 dtls.c                                   |    1 -
 dtls.h                                   |    1 +
 html/demos.html                          |   17 +-
 html/janus.js                            |   18 +-
 html/navbar.html                         |    5 +-
 html/nosiptest.html                      |  102 +
 html/nosiptest.js                        |  406 +++
 html/{siptest.html => sipretest.html}    |   27 +-
 html/sipretest.js                        |  650 +++++
 html/siptest.html                        |   10 +-
 ice.c                                    |   28 +-
 janus.c                                  |   18 +-
 janus.ggo                                |    2 +-
 mainpage.dox                             |  101 +-
 npm/.gitignore                           |    3 +
 npm/module.js                            |    8 +
 npm/package.json                         |   14 +
 npm/rollup.config.js                     |   17 +
 plugins/janus_audiobridge.c              |  210 +-
 plugins/janus_echotest.c                 |   27 +-
 plugins/janus_nosip.c                    | 2008 ++++++++++++++
 plugins/janus_recordplay.c               |   95 +-
 plugins/janus_sip.c                      |   58 +-
 plugins/janus_sipre.c                    | 4252 ++++++++++++++++++++++++++++++
 plugins/janus_streaming.c                |   14 +-
 plugins/janus_videocall.c                |   57 +-
 plugins/janus_videoroom.c                |   46 +-
 plugins/janus_voicemail.c                |    2 +-
 plugins/plugin.c                         |    4 +-
 plugins/plugin.h                         |   53 +-
 postprocessing/pp-g722.c                 |    8 +
 record.c                                 |   13 +-
 record.h                                 |    4 +-
 rtp.c                                    |   13 +-
 rtp.h                                    |   32 +-
 rtpsrtp.h                                |   46 +
 sdp-utils.c                              |  101 +
 sdp-utils.h                              |   25 +
 transports/janus_websockets.c            |    8 +-
 utils.h                                  |   11 +-
 50 files changed, 8467 insertions(+), 300 deletions(-)

diff --cc ice.c
index 330e7a8,c8e2a57..a170459
--- a/ice.c
+++ b/ice.c
@@@ -1245,10 -1224,12 +1245,12 @@@ void janus_ice_webrtc_hangup(janus_ice_
  					break;
  				}
  			}
 -			if(handle->iceloop != NULL && g_main_loop_is_running(handle->iceloop)) {
 +			if(g_main_loop_is_running(handle->iceloop)) {
  				JANUS_LOG(LOG_VERB, "[%"SCNu64"] Forcing ICE loop to quit (%s)\n", handle->handle_id, g_main_loop_is_running(handle->iceloop) ? "running" : "NOT running");
  				g_main_loop_quit(handle->iceloop);
- 				g_main_context_wakeup(handle->icectx);
+ 				if (handle->icectx != NULL) {
+ 					g_main_context_wakeup(handle->icectx);
+ 				}
  			}
  		}
  	}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/janus.git