summaryrefslogtreecommitdiff
path: root/channels/chan_h323.c
diff options
context:
space:
mode:
authorJeremy McNamara <jj@nufone.net>2004-11-11 20:10:45 +0000
committerJeremy McNamara <jj@nufone.net>2004-11-11 20:10:45 +0000
commita17779bba800d3768be4a67e231b34fd93352efd (patch)
tree70e9627290e46a125a06ab703b1a1ce73163ea16 /channels/chan_h323.c
parent7db49b3107d4e1f27bcccfd67115650a18f8d268 (diff)
lets try it this way
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_h323.c')
-rwxr-xr-xchannels/chan_h323.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 2050624a5..ae4b5c352 100755
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -448,7 +448,7 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout)
/* Clear and then set the address to call */
memset(addr, 0, sizeof(addr));
if (usingGk) {
- memcpy(addr, dest, strlen(addr));
+ memcpy(called_addr, dest, strlen(called_addr));
pvt->options.noFastStart = noFastStart;
pvt->options.noH245Tunneling = noH245Tunneling;
pvt->options.noSilenceSuppression = noSilenceSuppression;
@@ -456,12 +456,11 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout)
} else {
ast_inet_ntoa(addr, sizeof(addr), pvt->sa.sin_addr);
pvt->options.port = htons(pvt->sa.sin_port);
- }
- if (pvt->username) {
- sprintf(called_addr, "%s@%s", pvt->username, addr);
- } else {
- memcpy(called_addr, addr, strlen(called_addr));
- }
+ if (pvt->username) {
+ sprintf(called_addr, "%s@%s", pvt->username, addr);
+
+ }
+ }
pvt->outgoing = 1;
ast_log(LOG_DEBUG, "Placing outgoing call to %s:%d\n", called_addr, pvt->options.port);
res = h323_make_call(called_addr, &(pvt->cd), pvt->options);
@@ -949,7 +948,7 @@ static int create_addr(struct oh323_pvt *pvt, char *opeer)
return 0;
}
}
-static struct ast_channel *oh323_request(const char *type, int format, void *data, int *cause)
+static struct ast_channel *oh323_request(const char *type, int format, void *data)
{
int oldformat;
struct oh323_pvt *pvt;