Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

remove references to jitter as we use Asterisk's RTP and fix a silly typo

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.0
Jeremy McNamara 23 years ago
parent 81a770b93f
commit d52ac4259b
5 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File

16
channels/h323/ast_h323.cpp
Unescape View File

@ -44,7 +44,6 @@ int mode = H323_DTMF_RFC2833;
BOOL noFastStart; BOOL noFastStart;
BOOL noH245Tunnelling; BOOL noH245Tunnelling;
BOOL noSilenceSuppression; BOOL noSilenceSuppression;
WORD jitter;
/** /**
* We assume that only one endPoint should exist. * We assume that only one endPoint should exist.
@ -382,17 +381,17 @@ H323Connection * MyH323EndPoint::CreateConnection(unsigned callReference, void *
if (noH245Tunnelling) if (noH245Tunnelling)
options |= H323Connection::H245TunnelingOptionDisable; options |= H323Connection::H245TunnelingOptionDisable;
return new MyH323Connection(*this, callReference, options, jitter); return new MyH323Connection(*this, callReference, options);
} }
/* MyH323Connection */ /* MyH323Connection */
MyH323Connection::MyH323Connection(MyH323EndPoint & ep, MyH323Connection::MyH323Connection(MyH323EndPoint & ep,
unsigned callReference, unsigned callReference,
unsigned options, unsigned options)
WORD jitter): H323Connection(ep, : H323Connection(ep,
callReference, callReference,
options) options)
{ {
remoteIpAddress = 0; // IP Address of remote endpoint remoteIpAddress = 0; // IP Address of remote endpoint
remotePort = 0; // remote endpoint Data port (control is dataPort+1) 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 */ /** 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()) { if (!end_point_exist()) {
@ -818,8 +817,6 @@ int h323_start_listener(int listenPort, struct sockaddr_in bindaddr, int _jitter
return 1; return 1;
} }
jitter = _jitter;
PIPSocket::Address interfaceAddress(bindaddr.sin_addr); PIPSocket::Address interfaceAddress(bindaddr.sin_addr);
if (!listenPort) if (!listenPort)
@ -921,7 +918,6 @@ int h323_set_gk(int gatekeeper_discover, char *gatekeeper, char *secret)
} }
} }
cout << "end" << endl;
return 0; return 0;
} }

2
channels/h323/ast_h323.h
Unescape View File

@ -125,7 +125,7 @@ class MyH323Connection : public H323Connection {
PCLASSINFO(MyH323Connection, H323Connection); PCLASSINFO(MyH323Connection, H323Connection);
public: public:
MyH323Connection(MyH323EndPoint &, unsigned, unsigned, WORD); MyH323Connection(MyH323EndPoint &, unsigned, unsigned);
~MyH323Connection(); ~MyH323Connection();
H323Channel * CreateRealTimeLogicalChannel(const H323Capability &, H323Channel::Directions, unsigned, H323Channel * CreateRealTimeLogicalChannel(const H323Capability &, H323Channel::Directions, unsigned,

14
channels/h323/chan_h323.c
Unescape View File

@ -72,7 +72,6 @@ static int gatekeeper_disable = 1;
static int gatekeeper_discover = 0; static int gatekeeper_discover = 0;
static int usingGk; static int usingGk;
static int port = 1720; static int port = 1720;
static int jitter;
static int gkroute = 0; static int gkroute = 0;
/* Just about everybody seems to support ulaw, so make it a nice default */ /* 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")) { } else if (!strcasecmp(v->name, "context")) {
strncpy(alias->context, v->value, sizeof(alias->context)-1); strncpy(alias->context, v->value, sizeof(alias->context)-1);
} else if (!strcasecmp(v->name, "secret")) { } 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; v = v->next;
} }
@ -1340,14 +1339,7 @@ int reload_config()
v = ast_variable_browse(cfg, "general"); v = ast_variable_browse(cfg, "general");
while(v) { while(v) {
/* Create the interface list */ /* Create the interface list */
if (!strcasecmp(v->name, "jitter")) { if (!strcasecmp(v->name, "port")) {
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")) {
port = (int)strtol(v->value, NULL, 10); port = (int)strtol(v->value, NULL, 10);
} else if (!strcasecmp(v->name, "bindaddr")) { } else if (!strcasecmp(v->name, "bindaddr")) {
if (!(hp = gethostbyname(v->value))) { if (!(hp = gethostbyname(v->value))) {
@ -1643,7 +1635,7 @@ int load_module()
connection_made, send_digit); connection_made, send_digit);
/* start the h.323 listener */ /* 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"); ast_log(LOG_ERROR, "Unable to create H323 listener.\n");
// h323_end_process(); // h323_end_process();
return -1; return -1;

3
channels/h323/chan_h323.h
Unescape View File

@ -87,7 +87,6 @@ typedef struct call_options {
int noFastStart; int noFastStart;
int noH245Tunnelling; int noH245Tunnelling;
int noSilenceSuppression; int noSilenceSuppression;
int jitter;
unsigned int port; unsigned int port;
} call_options_t; } call_options_t;
@ -164,7 +163,7 @@ extern "C" {
int h323_set_gk(int, char *, char *); int h323_set_gk(int, char *, char *);
/* H323 listener related funcions */ /* 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 *); void h323_native_bridge(const char *, char *, char *);

3
channels/h323/h323.conf.sample
Unescape View File

@ -30,9 +30,6 @@ bindaddr = 0.0.0.0
;noH245Tunneling = no ;noH245Tunneling = no
;noSilenceSuppression = no ;noSilenceSuppression = no
; ;
; jitter buffer
;jitter = 100
;
; User-Input Mode (DTMF) ; User-Input Mode (DTMF)
; ;
; valid entries are: rfc2833, inband ; valid entries are: rfc2833, inband

Write Preview
Loading…
Cancel
Save