Merge branch 'master' of git.freeswitch.org:freeswitch

Makefile.am

@@ -61,6 +61,8 @@ sounds: sounds-en-us-callie-8000
 sounds-install: sounds-en-us-callie-8000-install
 sounds-ru: sounds-ru-RU-elena-8000
 sounds-ru-install: sounds-ru-RU-elena-8000-install
+sounds-fr: sounds-fr-ca-june-8000
+sounds-fr-install: sounds-fr-ca-june-8000-install
 moh: sounds-music-8000
 moh-install: sounds-music-8000-install
 
@@ -68,6 +70,8 @@ hd-sounds: sounds sounds-en-us-callie-16000
 hd-sounds-install: sounds-install sounds-en-us-callie-16000-install
 hd-sounds-ru: sounds-ru sounds-ru-RU-elena-16000
 hd-sounds-ru-install: sounds-ru-install sounds-ru-RU-elena-16000-install
+hd-sounds-fr: sounds-fr-ca-june-16000
+hd-sounds-fr-install: sounds-fr-ca-june-16000-install
 hd-moh: moh sounds-music-16000
 hd-moh-install: moh-install sounds-music-16000-install
 
@@ -75,6 +79,8 @@ uhd-sounds: hd-sounds sounds-en-us-callie-32000
 uhd-sounds-install: hd-sounds-install sounds-en-us-callie-32000-install
 uhd-sounds-ru: hd-sounds-ru sounds-ru-RU-elena-32000
 uhd-sounds-ru-install: hd-sounds-ru-install sounds-ru-RU-elena-32000-install
+uhd-sounds-fr: sounds-fr-ca-june-32000
+uhd-sounds-fr-install: sounds-fr-ca-june-32000-install
 uhd-moh: hd-moh sounds-music-32000
 uhd-moh-install: hd-moh-install sounds-music-32000-install
 
@@ -82,6 +88,8 @@ cd-sounds: uhd-sounds sounds-en-us-callie-48000
 cd-sounds-install: uhd-sounds-install sounds-en-us-callie-48000-install
 cd-sounds-ru: uhd-sounds-ru sounds-ru-RU-elena-48000
 cd-sounds-ru-install: uhd-sounds-ru-install sounds-ru-RU-elena-48000-install
+cd-sounds-fr: sounds-fr-ca-june-48000
+cd-sounds-fr-install: sounds-fr-ca-june-48000-install
 cd-moh: uhd-moh sounds-music-48000
 cd-moh-install: uhd-moh-install sounds-music-48000-install
 

configure.ac

@@ -602,12 +602,16 @@ PLATFORM_CORE_LDFLAGS=
 PLATFORM_CORE_LIBS=
 
 path_remove () {
-  echo "$1" | sed 's/:/\n/g' | grep -Fxv "$2" | tr '\n' ':' | sed 's/:$/\n/'
+  echo "$1" | tr ':' '\n' | grep -Fxv "$2" | tr '\n' ':' | sed 's/:$//'
 }
 path_push_unique () {
   x="$(eval echo \$$1)"
   x="$(path_remove "$x" "$2")"
-  eval export $1="$2:$x"
+  if test -z "$x"; then
+    eval export $1="$2"
+  else
+    eval export $1="$2:$x"
+  fi
 }
 
 # tweak platform specific flags

src/mod/endpoints/mod_sofia/sofia_presence.c

@@ -2253,10 +2253,6 @@ static void _send_presence_notify(sofia_profile_t *profile,
 
 	if (dst->route_uri) {
 		route_uri = sofia_glue_strip_uri(dst->route_uri);
-	} else {
-		if (remote_ip && remote_port) {
-			route_uri = switch_mprintf("sip:user@%s:%s;transport=%s", remote_ip, remote_port, tp);
-		}
 	}
 
 	if (expires) {

src/switch_cpp.cpp

@@ -1348,19 +1348,24 @@ SWITCH_DECLARE(void) bridge(CoreSession &session_a, CoreSession &session_b)
 
 SWITCH_DECLARE_NONSTD(switch_status_t) hanguphook(switch_core_session_t *session_hungup) 
 {
-	switch_channel_t *channel = switch_core_session_get_channel(session_hungup);
-	CoreSession *coresession = NULL;
-	switch_channel_state_t state = switch_channel_get_state(channel);
-
-	if ((coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"))) {
-		if (coresession->hook_state != state) {
-			coresession->cause = switch_channel_get_cause(channel);
-			coresession->hook_state = state;
-			coresession->check_hangup_hook();
+	if (session_hungup) {
+		switch_channel_t *channel = switch_core_session_get_channel(session_hungup);
+		CoreSession *coresession = NULL;
+		switch_channel_state_t state = switch_channel_get_state(channel);
+
+		if ((coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"))) {
+			if (coresession->hook_state != state) {
+				coresession->cause = switch_channel_get_cause(channel);
+				coresession->hook_state = state;
+				coresession->check_hangup_hook();
+			}
 		}
-	}
 
-	return SWITCH_STATUS_SUCCESS;
+		return SWITCH_STATUS_SUCCESS;
+	} else {
+		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "hangup hook called with null session, something is horribly wrong\n");
+		return SWITCH_STATUS_FALSE;
+	}
 }