[asterisk-commits] pcadach: branch 1.4 r43582 - in /branches/1.4/channels: ./ h323/

[asterisk-commits at lists.digium.com]

Author: pcadach
Date: Mon Sep 25 01:15:24 2006
New Revision: 43582

URL: http://svn.digium.com/view/asterisk?rev=43582&view=rev
Log:
Merged revisions 43472,43495 from trunk

Modified:
    branches/1.4/channels/chan_h323.c
    branches/1.4/channels/h323/caps_h323.cxx
    branches/1.4/channels/h323/compat_h323.h

Modified: branches/1.4/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_h323.c?rev=43582&r1=43581&r2=43582&view=diff
==============================================================================
--- branches/1.4/channels/chan_h323.c (original)
+++ branches/1.4/channels/chan_h323.c Mon Sep 25 01:15:24 2006
@@ -2676,7 +2676,7 @@
 	struct oh323_alias *alias = NULL;
 	struct ast_hostent ahp; struct hostent *hp;
 	char *cat;
-	char *utype;
+	const char *utype;
 	int is_user, is_peer, is_alias;
 	char _gatekeeper[100];
 	int gk_discover, gk_disable, gk_changed;
@@ -2721,7 +2721,7 @@
 	if (ucfg) {
 		struct ast_variable *gen;
 		int genhas_h323;
-		char *has_h323;
+		const char *has_h323;
 
 		genhas_h323 = ast_true(ast_variable_retrieve(ucfg, "general", "hash323"));
 		gen = ast_variable_browse(ucfg, "general");

Modified: branches/1.4/channels/h323/caps_h323.cxx
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/h323/caps_h323.cxx?rev=43582&r1=43581&r2=43582&view=diff
==============================================================================
--- branches/1.4/channels/h323/caps_h323.cxx (original)
+++ branches/1.4/channels/h323/caps_h323.cxx Mon Sep 25 01:15:24 2006
@@ -1,5 +1,7 @@
 #include <ptlib.h>
 #include <h323.h>
+#include <h245.h>
+#include "ast_h323.h"
 #include "caps_h323.h"
 
 #define DEFINE_G711_CAPABILITY(cls, code, capName) \

Modified: branches/1.4/channels/h323/compat_h323.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/h323/compat_h323.h?rev=43582&r1=43581&r2=43582&view=diff
==============================================================================
--- branches/1.4/channels/h323/compat_h323.h (original)
+++ branches/1.4/channels/h323/compat_h323.h Mon Sep 25 01:15:24 2006
@@ -52,7 +52,7 @@
 class MyPFactory: public PFactory<_Abstract_T, _Key_T>
 {
 public:
-	template <class _Contrete_T> class Worker: public PFactory<_Abstract_T, _Key_T>::WorkerBase
+	template <class _Concrete_T> class Worker: public PFactory<_Abstract_T, _Key_T>::WorkerBase
 	{
 	public:
 		Worker(const _Key_T &_key, bool singleton = false)
@@ -64,6 +64,8 @@
 		{
 			PFactory<_Abstract_T, _Key_T>::Unregister(key);
 		}
+	protected:
+		virtual _Abstract_T *Create(const _Key_T &) const { return new _Concrete_T; }
 
 	private:
 		PString key;