[Asterisk-cvs] asterisk/channels chan_h323.c,1.89,1.90

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv4211

Modified Files:
	chan_h323.c 
Log Message:
lets try it this way

Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- chan_h323.c	11 Nov 2004 20:04:00 -0000	1.89
+++ chan_h323.c	11 Nov 2004 20:10:45 -0000	1.90
@@ -448,7 +448,7 @@
         /* Clear and then set the address to call */
         memset(addr, 0, sizeof(addr));
         if (usingGk) {
-                memcpy(addr, dest, strlen(addr));
+                memcpy(called_addr, dest, strlen(called_addr));
                 pvt->options.noFastStart = noFastStart;
                 pvt->options.noH245Tunneling = noH245Tunneling;
                 pvt->options.noSilenceSuppression = noSilenceSuppression;
@@ -456,12 +456,11 @@
         } else {
                 ast_inet_ntoa(addr, sizeof(addr), pvt->sa.sin_addr);
                 pvt->options.port = htons(pvt->sa.sin_port);
-        }
-	if (pvt->username) {
-	        sprintf(called_addr, "%s@%s", pvt->username, addr);
-        } else {
-		memcpy(called_addr, addr, strlen(called_addr));
-	}
+		if (pvt->username) {
+		        sprintf(called_addr, "%s@%s", pvt->username, addr);
+
+        	}
+	}       
 	pvt->outgoing = 1;
 	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);
@@ -949,7 +948,7 @@
 		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;
 	struct oh323_pvt *pvt;