aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b>2003-12-10 23:34:47 +0000
committerjeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b>2003-12-10 23:34:47 +0000
commitbbbba49a514ece6db38365799a507bf7ff5fa476 (patch)
treeb8452404e20632d2832537db45f0cca56cda3f39
parenteb5742866ae1ef56c2e1d9dc917e972554b47f55 (diff)
stomp on seg if no config file
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1852 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-xchannels/chan_h323.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 110eae3a6..f013060da 100755
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -1410,6 +1410,9 @@ int reload_config(void)
return 1;
}
+ /* fire up the H.323 Endpoint */
+ h323_end_point_create();
+
h323debug=0;
dtmfmode = H323_DTMF_RFC2833;
@@ -1718,12 +1721,12 @@ int load_module()
{
int res;
- /* fire up the H.323 Endpoint */
- h323_end_point_create();
-
res = reload_config();
- if (!res) {
- /* Make sure we can register our channel type */
+
+ if (res) {
+ return 0;
+ } else {
+ /* Make sure we can register our channel type */
if (ast_channel_register(type, tdesc, capability, oh323_request)) {
ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
h323_end_process();
@@ -1774,8 +1777,6 @@ int load_module()
}
/* And start the monitor for the first time */
restart_monitor();
- } else {
- h323_end_process();
}
return res;
}