lets try it this way

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeremy McNamara
2004-11-11 20:10:45 +00:00
parent 7db49b3107
commit a17779bba8

View File

@@ -448,7 +448,7 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout)
/* Clear and then set the address to call */ /* Clear and then set the address to call */
memset(addr, 0, sizeof(addr)); memset(addr, 0, sizeof(addr));
if (usingGk) { if (usingGk) {
memcpy(addr, dest, strlen(addr)); memcpy(called_addr, dest, strlen(called_addr));
pvt->options.noFastStart = noFastStart; pvt->options.noFastStart = noFastStart;
pvt->options.noH245Tunneling = noH245Tunneling; pvt->options.noH245Tunneling = noH245Tunneling;
pvt->options.noSilenceSuppression = noSilenceSuppression; pvt->options.noSilenceSuppression = noSilenceSuppression;
@@ -456,12 +456,11 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout)
} else { } else {
ast_inet_ntoa(addr, sizeof(addr), pvt->sa.sin_addr); ast_inet_ntoa(addr, sizeof(addr), pvt->sa.sin_addr);
pvt->options.port = htons(pvt->sa.sin_port); pvt->options.port = htons(pvt->sa.sin_port);
} if (pvt->username) {
if (pvt->username) { sprintf(called_addr, "%s@%s", pvt->username, addr);
sprintf(called_addr, "%s@%s", pvt->username, addr);
} else { }
memcpy(called_addr, addr, strlen(called_addr)); }
}
pvt->outgoing = 1; pvt->outgoing = 1;
ast_log(LOG_DEBUG, "Placing outgoing call to %s:%d\n", called_addr, pvt->options.port); 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); 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; 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; int oldformat;
struct oh323_pvt *pvt; struct oh323_pvt *pvt;