kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 07:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing unlock at MWI message sending time

Browse Source 
(closes issue ASTERISK-18573)

Patches:
   sip_mwi_lock.patch (license #5041) by Gregory Hinton Nietsky

Thanks to irrot for the reminder, to Gregory for the patch!


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@336378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2011-09-19 09:40:44 +00:00
parent 928de8c08a
commit 7a2e489631
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -278,7 +278,7 @@ MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
ifneq ($(findstring darwin,$(OSARCH)),) ifneq ($(findstring darwin,$(OSARCH)),)
_ASTCFLAGS+=-D__Darwin__ _ASTCFLAGS+=-D__Darwin__
SOLINK=-bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace SOLINK=-bundle -Xlinker -macosx_version_min -Xlinker 10.4 -Xlinker -undefined -Xlinker dynamic_lookup -force_flat_namespace
ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.6) ifeq ($(shell /usr/bin/sw_vers -productVersion | cut -c1-4),10.7)
SOLINK+=/usr/lib/bundle1.o SOLINK+=/usr/lib/bundle1.o
endif endif
_ASTLDFLAGS+=-L/usr/local/lib _ASTLDFLAGS+=-L/usr/local/lib

1
channels/chan_sip.c
View File

@@ -25030,6 +25030,7 @@ static int sip_send_mwi_to_peer(struct sip_peer *peer, int cache_only)
dialog_unlink_all(p, TRUE, TRUE); dialog_unlink_all(p, TRUE, TRUE);
dialog_unref(p, "unref dialog p just created via sip_alloc"); dialog_unref(p, "unref dialog p just created via sip_alloc");
/* sip_destroy(p); */ /* sip_destroy(p); */
ao2_unlock(peer);
return 0; return 0;
} }
/* Recalculate our side, and recalculate Call ID */ /* Recalculate our side, and recalculate Call ID */