diff options
| author | jeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-07-24 23:29:04 +0000 |
|---|---|---|
| committer | jeremy <jeremy@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-07-24 23:29:04 +0000 |
| commit | 0bc8eb5b1268b49bb8bf5c581c15aa6a87395066 (patch) | |
| tree | d318d2ea0a2df006d44b707dfbadaf028c937c7c /channels/h323 | |
| parent | 2067edc35541d6b2f6c4b902dd1671bd256a9a94 (diff) | |
rollback today's futile attempts properly
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1221 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/h323')
| -rwxr-xr-x | channels/h323/ast_h323.cpp | 4 | ||||
| -rwxr-xr-x | channels/h323/chan_h323.c | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp index a827452ab..9f6f7f9ae 100755 --- a/channels/h323/ast_h323.cpp +++ b/channels/h323/ast_h323.cpp @@ -205,9 +205,9 @@ int MyH323EndPoint::MakeCall(const PString & dest, PString & token, *callReference = connection->GetCallReference(); - if (strlen(callerid)) { + if (strlen(callerid)) connection->SetLocalPartyName(PString(callerid)); - } + connection->Unlock(); if (h323debug) { diff --git a/channels/h323/chan_h323.c b/channels/h323/chan_h323.c index 4aeef6ed3..017a16436 100755 --- a/channels/h323/chan_h323.c +++ b/channels/h323/chan_h323.c @@ -409,19 +409,6 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout) p->calloptions.callerid = strdup(c->callerid); } -#if 0 -// Sumfing ain't right here - - char *tmp = strchr(c->callerid, '"'); - if (!tmp) { - p->calloptions.callerid = malloc(sizeof(c->callerid+20)); // evil - sprintf(p->calloptions.callerid, "\"Unknown Name\" <%s>", c->callerid); - } else { - - } - -#endif - res = h323_make_call(called_addr, &(p->cd), p->calloptions); if (res) { |