rollback today's futile attempts properly
authorJeremy McNamara <jj@nufone.net>
Thu, 24 Jul 2003 23:29:04 +0000 (23:29 +0000)
committerJeremy McNamara <jj@nufone.net>
Thu, 24 Jul 2003 23:29:04 +0000 (23:29 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1221 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/h323/ast_h323.cpp
channels/h323/chan_h323.c

index a827452..9f6f7f9 100755 (executable)
@@ -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) {
index 4aeef6e..017a164 100755 (executable)
@@ -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) {