[Asterisk-cvs] asterisk/channels chan_sip.c,1.598,1.599

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv14816/channels

Modified Files:
	chan_sip.c 
Log Message:
Add Asterisk "object model" and update chan_sip to use it for peers/regs/users


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.598
retrieving revision 1.599
diff -u -d -r1.598 -r1.599
--- chan_sip.c	23 Dec 2004 01:28:41 -0000	1.598
+++ chan_sip.c	25 Dec 2004 22:15:32 -0000	1.599
@@ -43,6 +43,7 @@
 #include <asterisk/causes.h>
 #include <asterisk/utils.h>
 #include <asterisk/file.h>
+#include <asterisk/astobj.h>
 #ifdef OSP_SUPPORT
 #include <asterisk/astosp.h>
 #endif
@@ -157,6 +158,14 @@
 
 static int global_reg_timeout = DEFAULT_REGISTRATION_TIMEOUT;
 
[...1117 lines suppressed...]
 	ast_unregister_application(app_sipaddheader);
 	ast_unregister_application(app_sipgetheader);
 	ast_cli_unregister(&cli_show_users);
+	ast_cli_unregister(&cli_show_objects);
 	ast_cli_unregister(&cli_show_channels);
 	ast_cli_unregister(&cli_show_channel);
 	ast_cli_unregister(&cli_show_history);
@@ -9634,9 +9554,9 @@
 	}
 	/* Free memory for local network address mask */
 	ast_free_ha(localaddr);
-	ast_mutex_destroy(&userl.lock);
-	ast_mutex_destroy(&peerl.lock);
-	ast_mutex_destroy(&regl.lock);
+	ASTOBJ_CONTAINER_RELEASE(&userl);
+	ASTOBJ_CONTAINER_RELEASE(&peerl);
+	ASTOBJ_CONTAINER_RELEASE(&regl);
 		
 	return 0;
 }