diff options
author | Jeremy McNamara <jj@nufone.net> | 2003-05-31 18:42:09 +0000 |
---|---|---|
committer | Jeremy McNamara <jj@nufone.net> | 2003-05-31 18:42:09 +0000 |
commit | d52ac4259b32ad48b09aaca5db59e431e6b82a4f (patch) | |
tree | 58062a8a6b6a30ab0d1c6f7c93d9c487e2532cec | |
parent | 81a770b93fabe54a4c38354729d7187885751314 (diff) |
remove references to jitter as we use Asterisk's RTP and fix a silly typo
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | channels/h323/ast_h323.cpp | 16 | ||||
-rwxr-xr-x | channels/h323/ast_h323.h | 2 | ||||
-rwxr-xr-x | channels/h323/chan_h323.c | 14 | ||||
-rwxr-xr-x | channels/h323/chan_h323.h | 3 | ||||
-rwxr-xr-x | channels/h323/h323.conf.sample | 3 |
5 files changed, 11 insertions, 27 deletions
diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp index 892a2d0f5..010ff50f0 100755 --- a/channels/h323/ast_h323.cpp +++ b/channels/h323/ast_h323.cpp @@ -44,7 +44,6 @@ int mode = H323_DTMF_RFC2833; BOOL noFastStart; BOOL noH245Tunnelling; BOOL noSilenceSuppression; -WORD jitter; /** * We assume that only one endPoint should exist. @@ -382,17 +381,17 @@ H323Connection * MyH323EndPoint::CreateConnection(unsigned callReference, void * if (noH245Tunnelling) options |= H323Connection::H245TunnelingOptionDisable; - return new MyH323Connection(*this, callReference, options, jitter); + return new MyH323Connection(*this, callReference, options); } /* MyH323Connection */ MyH323Connection::MyH323Connection(MyH323EndPoint & ep, unsigned callReference, - unsigned options, - WORD jitter): H323Connection(ep, - callReference, - options) + unsigned options) + : H323Connection(ep, + callReference, + options) { remoteIpAddress = 0; // IP Address of remote endpoint remotePort = 0; // remote endpoint Data port (control is dataPort+1) @@ -810,7 +809,7 @@ int h323_set_capability(int cap, int dtmfMode) } /** Start the H.323 listener */ -int h323_start_listener(int listenPort, struct sockaddr_in bindaddr, int _jitter) +int h323_start_listener(int listenPort, struct sockaddr_in bindaddr) { if (!end_point_exist()) { @@ -818,8 +817,6 @@ int h323_start_listener(int listenPort, struct sockaddr_in bindaddr, int _jitter return 1; } - jitter = _jitter; - PIPSocket::Address interfaceAddress(bindaddr.sin_addr); if (!listenPort) @@ -921,7 +918,6 @@ int h323_set_gk(int gatekeeper_discover, char *gatekeeper, char *secret) } } - cout << "end" << endl; return 0; } diff --git a/channels/h323/ast_h323.h b/channels/h323/ast_h323.h index 888cd54ae..a190ae712 100755 --- a/channels/h323/ast_h323.h +++ b/channels/h323/ast_h323.h @@ -125,7 +125,7 @@ class MyH323Connection : public H323Connection { PCLASSINFO(MyH323Connection, H323Connection); public: - MyH323Connection(MyH323EndPoint &, unsigned, unsigned, WORD); + MyH323Connection(MyH323EndPoint &, unsigned, unsigned); ~MyH323Connection(); H323Channel * CreateRealTimeLogicalChannel(const H323Capability &, H323Channel::Directions, unsigned, diff --git a/channels/h323/chan_h323.c b/channels/h323/chan_h323.c index 9227d94bc..68e4ebfae 100755 --- a/channels/h323/chan_h323.c +++ b/channels/h323/chan_h323.c @@ -72,7 +72,6 @@ static int gatekeeper_disable = 1; static int gatekeeper_discover = 0; static int usingGk; static int port = 1720; -static int jitter; static int gkroute = 0; /* Just about everybody seems to support ulaw, so make it a nice default */ @@ -204,7 +203,7 @@ static struct oh323_alias *build_alias(char *name, struct ast_variable *v) } else if (!strcasecmp(v->name, "context")) { strncpy(alias->context, v->value, sizeof(alias->context)-1); } else if (!strcasecmp(v->name, "secret")) { - strncpy(alias->prefix, v->value, sizeof(alias->secret)-1); + strncpy(alias->secret, v->value, sizeof(alias->secret)-1); } v = v->next; } @@ -1340,14 +1339,7 @@ int reload_config() v = ast_variable_browse(cfg, "general"); while(v) { /* Create the interface list */ - if (!strcasecmp(v->name, "jitter")) { - jitter = (int) strtol(v->value, NULL, 10); - if (jitter < 20 || jitter > 10000) { - ast_log(LOG_NOTICE, "Invalid jitter value! Valid range: 20ms to 10000ms. Recommended: 100ms"); - ast_destroy(cfg); - return 0; - } - } else if (!strcasecmp(v->name, "port")) { + if (!strcasecmp(v->name, "port")) { port = (int)strtol(v->value, NULL, 10); } else if (!strcasecmp(v->name, "bindaddr")) { if (!(hp = gethostbyname(v->value))) { @@ -1643,7 +1635,7 @@ int load_module() connection_made, send_digit); /* start the h.323 listener */ - if (h323_start_listener(port, bindaddr, jitter)) { + if (h323_start_listener(port, bindaddr)) { ast_log(LOG_ERROR, "Unable to create H323 listener.\n"); // h323_end_process(); return -1; diff --git a/channels/h323/chan_h323.h b/channels/h323/chan_h323.h index e4f3756d0..dd49f2165 100755 --- a/channels/h323/chan_h323.h +++ b/channels/h323/chan_h323.h @@ -87,7 +87,6 @@ typedef struct call_options { int noFastStart; int noH245Tunnelling; int noSilenceSuppression; - int jitter; unsigned int port; } call_options_t; @@ -164,7 +163,7 @@ extern "C" { int h323_set_gk(int, char *, char *); /* H323 listener related funcions */ - int h323_start_listener(int, struct sockaddr_in, int); + int h323_start_listener(int, struct sockaddr_in); void h323_native_bridge(const char *, char *, char *); diff --git a/channels/h323/h323.conf.sample b/channels/h323/h323.conf.sample index c3009fb83..99c3fa910 100755 --- a/channels/h323/h323.conf.sample +++ b/channels/h323/h323.conf.sample @@ -30,9 +30,6 @@ bindaddr = 0.0.0.0 ;noH245Tunneling = no ;noSilenceSuppression = no ; -; jitter buffer -;jitter = 100 -; ; User-Input Mode (DTMF) ; ; valid entries are: rfc2833, inband |