try this crazy idea to make callerid work with no name

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1216 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 8 insertions, 5 deletions

diff --git a/channels/h323/ast_h323.cpp b/channels/h323/ast_h323.cpp
index 0e8d86d95..a827452ab 100755
--- a/channels/h323/ast_h323.cpp
+++ b/channels/h323/ast_h323.cpp
@@ -206,11 +206,8 @@ int MyH323EndPoint::MakeCall(const PString & dest, PString & token,
 	*callReference = connection->GetCallReference();
 	
 	if (strlen(callerid)) {
-		cout << "Setting callerid: [" << callerid << "]" << endl;
 		connection->SetLocalPartyName(PString(callerid));
-	} else {
-		cout << "Callerid NOT SET!" << endl; 
-	}
+	} 
 	connection->Unlock(); 	
 
 	if (h323debug) {
diff --git a/channels/h323/chan_h323.c b/channels/h323/chan_h323.c
index 017a16436..29c139647 100755
--- a/channels/h323/chan_h323.c
+++ b/channels/h323/chan_h323.c
@@ -406,7 +406,13 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout)
 
 	/* Copy callerid, if there is any */
 	if (strlen(c->callerid)) {
-		p->calloptions.callerid = strdup(c->callerid);
+		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 {
+			p->calloptions.callerid = strdup(c->callerid);
+		}
 	}
 
 	res = h323_make_call(called_addr, &(p->cd), p->calloptions);