[asterisk-commits] murf: branch murf/macrogosub r43532 - in
/team/murf/macrogosub: ./ channels/
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Sep 22 17:48:29 MST 2006
Author: murf
Date: Fri Sep 22 19:48:28 2006
New Revision: 43532
URL: http://svn.digium.com/view/asterisk?rev=43532&view=rev
Log:
Merged revisions 43434,43436-43437,43439-43440,43442,43444,43446-43447,43449,43451-43452,43455,43457-43461,43463,43465,43467,43470,43472,43478-43480,43483,43485,43488,43490,43493,43495-43496,43498,43500,43506-43507,43517,43519,43522,43525-43526 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r43434 | pcadach | 2006-09-21 13:18:13 -0600 (Thu, 21 Sep 2006) | 1 line
Check for 64-bit OpenH323/PWLib versions too, thanks to Mithraen (please, re-build configure script)
................
r43436 | kpfleming | 2006-09-21 13:22:33 -0600 (Thu, 21 Sep 2006) | 2 lines
regenerated at PCadach's request
................
r43437 | file | 2006-09-21 13:27:26 -0600 (Thu, 21 Sep 2006) | 2 lines
SS7 marked the start of an open season for trunk again but here's something minor - abstract early bridging into the technology so that we don't always assume they use RTP and try it.
................
r43439 | tilghman | 2006-09-21 13:35:29 -0600 (Thu, 21 Sep 2006) | 2 lines
Remove deprecated apps and funcs
................
r43440 | kpfleming | 2006-09-21 13:42:35 -0600 (Thu, 21 Sep 2006) | 2 lines
fix this so chan_zap links properly again
................
r43442 | tilghman | 2006-09-21 13:48:35 -0600 (Thu, 21 Sep 2006) | 10 lines
Merged revisions 43441 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43441 | tilghman | 2006-09-21 14:43:32 -0500 (Thu, 21 Sep 2006) | 2 lines
Oops, missed the merge breakage
........
................
r43444 | tilghman | 2006-09-21 14:01:54 -0600 (Thu, 21 Sep 2006) | 2 lines
Remove 1.4 changes from UPGRADE.txt, remove deprecated callerid field, remove deprecated SetGlobalVar app
................
r43446 | tilghman | 2006-09-21 14:23:32 -0600 (Thu, 21 Sep 2006) | 2 lines
More removal of deprecated stuff
................
r43447 | tilghman | 2006-09-21 14:24:50 -0600 (Thu, 21 Sep 2006) | 10 lines
Merged revisions 43445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43445 | tilghman | 2006-09-21 15:22:43 -0500 (Thu, 21 Sep 2006) | 2 lines
Fix documentation to reflect how Url() really works
........
................
r43449 | tilghman | 2006-09-21 15:17:39 -0600 (Thu, 21 Sep 2006) | 2 lines
Remove deprecated CLI apps from the core
................
r43451 | kpfleming | 2006-09-21 15:22:34 -0600 (Thu, 21 Sep 2006) | 10 lines
Merged revisions 43450 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43450 | kpfleming | 2006-09-21 16:21:29 -0500 (Thu, 21 Sep 2006) | 2 lines
add another attempt to strip non-API symbols from the final binary... script will need to be extended to work on non-Linux systems
........
................
r43452 | tilghman | 2006-09-21 15:59:12 -0600 (Thu, 21 Sep 2006) | 2 lines
Lots more removal of deprecated things
................
r43455 | file | 2006-09-21 16:14:31 -0600 (Thu, 21 Sep 2006) | 10 lines
Merged revisions 43454 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43454 | file | 2006-09-21 18:12:09 -0400 (Thu, 21 Sep 2006) | 2 lines
Clean up chan_mgcp's module load function (issue #8001 reported by Mithraen with mods by moi)
........
................
r43457 | file | 2006-09-21 16:23:30 -0600 (Thu, 21 Sep 2006) | 10 lines
Merged revisions 43456 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43456 | file | 2006-09-21 18:21:40 -0400 (Thu, 21 Sep 2006) | 2 lines
Some more clean up in the load function for chan_oss (issue #8002 reported by Mithraen with minor mods by moi)
........
................
r43458 | tilghman | 2006-09-21 16:23:49 -0600 (Thu, 21 Sep 2006) | 2 lines
And some deprecated APIs and modifications to documentation
................
r43459 | file | 2006-09-21 16:32:28 -0600 (Thu, 21 Sep 2006) | 2 lines
Clean up chan_alsa load module function (issue #8000 reported by Mithraen)
................
r43460 | qwell | 2006-09-21 16:44:23 -0600 (Thu, 21 Sep 2006) | 2 lines
Suppress compiler warnings
................
r43461 | file | 2006-09-21 16:53:17 -0600 (Thu, 21 Sep 2006) | 2 lines
Oh look more changes, but these are my own! (Clean up module load functions)
................
r43463 | tilghman | 2006-09-21 17:01:00 -0600 (Thu, 21 Sep 2006) | 2 lines
Set process limits without restarting Asterisk
................
r43465 | tilghman | 2006-09-21 17:29:32 -0600 (Thu, 21 Sep 2006) | 10 lines
Merged revisions 43464 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43464 | tilghman | 2006-09-21 18:24:41 -0500 (Thu, 21 Sep 2006) | 2 lines
Twould help if we actually documented how the new features in res_odbc actually work. (Oops)
........
................
r43467 | mogorman | 2006-09-21 17:55:13 -0600 (Thu, 21 Sep 2006) | 10 lines
Merged revisions 43466 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43466 | mogorman | 2006-09-21 18:50:56 -0500 (Thu, 21 Sep 2006) | 2 lines
updates for better compontent support
........
................
r43470 | qwell | 2006-09-21 21:09:22 -0600 (Thu, 21 Sep 2006) | 12 lines
Merged revisions 43469 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43469 | qwell | 2006-09-21 20:01:16 -0700 (Thu, 21 Sep 2006) | 4 lines
First shot at unload_module in chan_skinny..
More to come.
........
................
r43472 | pcadach | 2006-09-21 22:54:41 -0600 (Thu, 21 Sep 2006) | 1 line
Add missing include
................
r43478 | russell | 2006-09-22 08:04:46 -0600 (Fri, 22 Sep 2006) | 11 lines
Merged revisions 43477 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43477 | russell | 2006-09-22 10:02:58 -0400 (Fri, 22 Sep 2006) | 3 lines
Suppress a compiler warning about the use of a potentially uninitialized
variable. It couldn't actually happen, though.
........
................
r43479 | rizzo | 2006-09-22 08:56:21 -0600 (Fri, 22 Sep 2006) | 4 lines
style fix:
move variable declaration at the beginning of the block.
................
r43480 | rizzo | 2006-09-22 08:58:24 -0600 (Fri, 22 Sep 2006) | 5 lines
compatibility fix:
use "attribute_XXX" instead of *__attribute__ ((XXX)) so we
can handle compiler/os dependencies in our compiler.h
................
r43483 | russell | 2006-09-22 09:45:51 -0600 (Fri, 22 Sep 2006) | 11 lines
Merged revisions 43482 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43482 | russell | 2006-09-22 11:42:44 -0400 (Fri, 22 Sep 2006) | 3 lines
return AST_MODULE_LOAD_DECLIDE if mISDN could not be configured
(issue #8006, Mithraen)
........
................
r43485 | russell | 2006-09-22 09:50:30 -0600 (Fri, 22 Sep 2006) | 10 lines
Blocked revisions 43484 via svnmerge
........
r43484 | russell | 2006-09-22 11:47:14 -0400 (Fri, 22 Sep 2006) | 3 lines
backport the compatability fix to use attribute_malloc instaed of
__attribute__ ((malloc))
........
................
r43488 | kpfleming | 2006-09-22 10:25:04 -0600 (Fri, 22 Sep 2006) | 10 lines
Merged revisions 43486 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43486 | kpfleming | 2006-09-22 10:51:13 -0500 (Fri, 22 Sep 2006) | 2 lines
all the Linux systems I have don't use '__m_count' for this field, so I don't know where this came from...
........
................
r43490 | kpfleming | 2006-09-22 10:43:00 -0600 (Fri, 22 Sep 2006) | 10 lines
Merged revisions 43489 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43489 | kpfleming | 2006-09-22 11:42:46 -0500 (Fri, 22 Sep 2006) | 2 lines
use rebuilt extra sounds
........
................
r43493 | qwell | 2006-09-22 11:26:10 -0600 (Fri, 22 Sep 2006) | 10 lines
Merged revisions 43492 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43492 | qwell | 2006-09-22 10:25:05 -0700 (Fri, 22 Sep 2006) | 2 lines
Make sure we explicitly set the CLI command to not be deprecated, if it isn't.
........
................
r43495 | pcadach | 2006-09-22 13:54:20 -0600 (Fri, 22 Sep 2006) | 1 line
Fix our capability's factory
................
r43496 | pcadach | 2006-09-22 13:56:07 -0600 (Fri, 22 Sep 2006) | 1 line
Use own factory for our OpalMediaFormats too
................
r43498 | pcadach | 2006-09-22 14:00:31 -0600 (Fri, 22 Sep 2006) | 1 line
Fix compilation warnings
................
r43500 | pcadach | 2006-09-22 14:33:47 -0600 (Fri, 22 Sep 2006) | 1 line
Move from h.323 to h323 command prefix
................
r43506 | murf | 2006-09-22 15:17:07 -0600 (Fri, 22 Sep 2006) | 1 line
As per bug 8004, we now return AST_MODULE_LOAD_DECLINE when we can't read extensions.ael
................
r43507 | murf | 2006-09-22 15:34:04 -0600 (Fri, 22 Sep 2006) | 1 line
This commits a change to return MODULE_LOAD_FAILURE on error, and SUCCESS (instead of 0) when all goes well for bug 8004
................
r43517 | file | 2006-09-22 16:01:23 -0600 (Fri, 22 Sep 2006) | 16 lines
Blocked revisions 43510 via svnmerge
................
r43510 | file | 2006-09-22 17:59:50 -0400 (Fri, 22 Sep 2006) | 9 lines
Blocked revisions 43509 via svnmerge
........
r43509 | file | 2006-09-22 17:53:51 -0400 (Fri, 22 Sep 2006) | 2 lines
Yay another 'round of spy fixes! This fixes a small logic flaw with the cleanup function and a memory allocation issue. (issue #7960 reported by jojo & issue #7999 reported by aster1) Special thanks to csum77 for letting me into a box where this issue was happening.
........
................
................
r43519 | qwell | 2006-09-22 16:13:47 -0600 (Fri, 22 Sep 2006) | 12 lines
Merged revisions 43518 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43518 | qwell | 2006-09-22 15:12:12 -0700 (Fri, 22 Sep 2006) | 4 lines
Allow chan_skinny.so to be unloaded properly.
Remove reload support, since it doesn't actually...work.
........
................
r43522 | file | 2006-09-22 17:34:27 -0600 (Fri, 22 Sep 2006) | 2 lines
You see nothing...
................
r43525 | kpfleming | 2006-09-22 17:45:14 -0600 (Fri, 22 Sep 2006) | 10 lines
Merged revisions 43524 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r43524 | kpfleming | 2006-09-22 18:44:47 -0500 (Fri, 22 Sep 2006) | 2 lines
don't output the 'build complete' message when the target being run is already going to do an installation
........
................
r43526 | kpfleming | 2006-09-22 17:46:02 -0600 (Fri, 22 Sep 2006) | 2 lines
file forgot one :-)
................
Modified:
team/murf/macrogosub/ (props changed)
team/murf/macrogosub/Makefile
team/murf/macrogosub/channels/chan_skinny.c
Propchange: team/murf/macrogosub/
------------------------------------------------------------------------------
automerge = yes
Propchange: team/murf/macrogosub/
------------------------------------------------------------------------------
--- branch-1.4-blocked (original)
+++ branch-1.4-blocked Fri Sep 22 19:48:28 2006
@@ -1,1 +1,1 @@
-/branches/1.4:43484
+/branches/1.4:43484,43510
Propchange: team/murf/macrogosub/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Fri Sep 22 19:48:28 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486,43489,43492
+/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486,43489,43492,43518,43524
Propchange: team/murf/macrogosub/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep 22 19:48:28 2006
@@ -1,1 +1,1 @@
-/trunk:1-43433
+/trunk:1-43531
Modified: team/murf/macrogosub/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/macrogosub/Makefile?rev=43532&r1=43531&r2=43532&view=diff
==============================================================================
--- team/murf/macrogosub/Makefile (original)
+++ team/murf/macrogosub/Makefile Fri Sep 22 19:48:28 2006
@@ -231,13 +231,15 @@
HAVEDOT=no
endif
-all: cleantest $(SUBDIRS)
+all: _all
@echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, and +"
@echo " + can be installed by running: +"
@echo " + +"
@echo " + make install +"
@echo " +-------------------------------------------+"
+
+_all: cleantest $(SUBDIRS)
makeopts: configure
@echo "****"
@@ -329,7 +331,7 @@
rm -rf doc/api
rm -f build_tools/menuselect-deps
-datafiles: all
+datafiles: _all
if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
@@ -363,7 +365,7 @@
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
-bininstall: all
+bininstall: _all
mkdir -p $(DESTDIR)$(MODULES_DIR)
mkdir -p $(DESTDIR)$(ASTSBINDIR)
mkdir -p $(DESTDIR)$(ASTETCDIR)
@@ -427,7 +429,7 @@
echo " WARNING WARNING WARNING" ;\
fi
-install: all datafiles bininstall $(SUBDIRS_INSTALL)
+install: datafiles bininstall $(SUBDIRS_INSTALL)
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
fi
@@ -454,7 +456,7 @@
@echo " +-------------------------------------------+"
@$(MAKE) -s oldmodcheck
-upgrade: all bininstall
+upgrade: bininstall
adsi:
mkdir -p $(DESTDIR)$(ASTETCDIR)
Modified: team/murf/macrogosub/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/murf/macrogosub/channels/chan_skinny.c?rev=43532&r1=43531&r2=43532&view=diff
==============================================================================
--- team/murf/macrogosub/channels/chan_skinny.c (original)
+++ team/murf/macrogosub/channels/chan_skinny.c Fri Sep 22 19:48:28 2006
@@ -4234,10 +4234,8 @@
/* If we're supposed to be stopped -- stay stopped */
if (monitor_thread == AST_PTHREADT_STOP)
return 0;
- if (ast_mutex_lock(&monlock)) {
- ast_log(LOG_WARNING, "Unable to lock monitor\n");
- return -1;
- }
+
+ ast_mutex_lock(&monlock);
if (monitor_thread == pthread_self()) {
ast_mutex_unlock(&monlock);
ast_log(LOG_WARNING, "Cannot kill myself\n");
@@ -4476,6 +4474,11 @@
ast_mutex_unlock(&devicelock);
}
+#if 0
+/*
+ * XXX This never worked properly anyways.
+ * Let's get rid of it, until we can fix it.
+ */
static int reload(void)
{
delete_devices();
@@ -4483,6 +4486,7 @@
restart_monitor();
return 0;
}
+#endif
static int load_module(void)
{
@@ -4521,6 +4525,39 @@
static int unload_module(void)
{
+ struct skinnysession *s, *slast;
+ struct skinny_device *d;
+ struct skinny_line *l;
+ struct skinny_subchannel *sub;
+
+ ast_mutex_lock(&sessionlock);
+ /* Destroy all the interfaces and free their memory */
+ s = sessions;
+ while(s) {
+ slast = s;
+ s = s->next;
+ for (d = slast->device; d; d = d->next) {
+ for (l = d->lines; l; l = l->next) {
+ ast_mutex_lock(&l->lock);
+ for (sub = l->sub; sub; sub = sub->next) {
+ ast_mutex_lock(&sub->lock);
+ if (sub->owner) {
+ sub->alreadygone = 1;
+ ast_softhangup(sub->owner, AST_SOFTHANGUP_APPUNLOAD);
+ }
+ ast_mutex_unlock(&sub->lock);
+ }
+ ast_mutex_unlock(&l->lock);
+ }
+ }
+ if (slast->fd > -1)
+ close(slast->fd);
+ ast_mutex_destroy(&slast->lock);
+ free(slast);
+ }
+ sessions = NULL;
+ ast_mutex_unlock(&sessionlock);
+
delete_devices();
ast_mutex_lock(&monlock);
@@ -4532,20 +4569,21 @@
monitor_thread = AST_PTHREADT_STOP;
ast_mutex_unlock(&monlock);
-#if 0 /* XXX This is...funky. Will fix shortly */
- ast_mutex_lock(&sessionlock);
- /* Destroy all the interfaces and free their memory */
- p = iflist;
- while(p) {
- pl = p;
- p = p->next;
- /* Free associated memory */
- ast_mutex_destroy(&pl->lock);
- free(pl);
- }
- iflist = NULL;
- ast_mutex_unlock(&sessionlock);
-#endif
+ if (tcp_thread && (tcp_thread != AST_PTHREADT_STOP)) {
+ pthread_cancel(tcp_thread);
+ pthread_kill(tcp_thread, SIGURG);
+ pthread_join(tcp_thread, NULL);
+ }
+ tcp_thread = AST_PTHREADT_STOP;
+
+ ast_mutex_lock(&netlock);
+ if (accept_t && (accept_t != AST_PTHREADT_STOP)) {
+ pthread_cancel(accept_t);
+ pthread_kill(accept_t, SIGURG);
+ pthread_join(accept_t, NULL);
+ }
+ accept_t = AST_PTHREADT_STOP;
+ ast_mutex_unlock(&netlock);
ast_rtp_proto_unregister(&skinny_rtp);
ast_channel_unregister(&skinny_tech);
@@ -4560,5 +4598,4 @@
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Skinny Client Control Protocol (Skinny)",
.load = load_module,
.unload = unload_module,
- .reload = reload,
);
More information about the asterisk-commits
mailing list