deal with no callerid name in all cases. really need to rethink this function
authorJeremy McNamara <jj@nufone.net>
Thu, 24 Jul 2003 17:13:13 +0000 (17:13 +0000)
committerJeremy McNamara <jj@nufone.net>
Thu, 24 Jul 2003 17:13:13 +0000 (17:13 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1210 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/h323/chan_h323.c

index de18ea6..8804ac5 100755 (executable)
@@ -963,7 +963,11 @@ int setup_incoming_call(call_details_t cd)
                        strncpy(p->context, alias->context, sizeof(p->context)-1);
                }
 
                        strncpy(p->context, alias->context, sizeof(p->context)-1);
                }
 
-               sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164);
+               if (!strlen(p->cd.call_source_aliases)) 
+                       sprintf(p->callerid, "Unknown Name <%s>", p->cd.call_source_e164); 
+               else
+                       sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164); 
+
 
        } else { 
                /* Either this call is not from the Gatekeeper 
 
        } else { 
                /* Either this call is not from the Gatekeeper 
@@ -972,7 +976,10 @@ int setup_incoming_call(call_details_t cd)
                user  = find_user(cd.call_source_aliases);
                
                if (!user) {
                user  = find_user(cd.call_source_aliases);
                
                if (!user) {
-                       sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164); 
+                       if (!strlen(p->cd.call_source_aliases)) 
+                               sprintf(p->callerid, "Unknown Name <%s>", p->cd.call_source_e164); 
+                       else
+                               sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164); 
                        if (strlen(p->cd.call_dest_e164)) {
                                strncpy(p->exten, cd.call_dest_e164, sizeof(p->exten)-1);
                        } else {
                        if (strlen(p->cd.call_dest_e164)) {
                                strncpy(p->exten, cd.call_dest_e164, sizeof(p->exten)-1);
                        } else {