[svn-commits] jdixon: branch jdixon/chan_usbradio-1.4 r139342 - /team/jdixon/chan_usbradio-...

[SVN commits to the Digium repositories]

Author: jdixon
Date: Thu Aug 21 17:28:51 2008
New Revision: 139342

URL: http://svn.digium.com/view/asterisk?view=rev&rev=139342
Log:
Fixed silly compilation problem and node issue with less then 6 digits

Modified:
    team/jdixon/chan_usbradio-1.4/dev-1.0/channels/chan_echolink.c

Modified: team/jdixon/chan_usbradio-1.4/dev-1.0/channels/chan_echolink.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/dev-1.0/channels/chan_echolink.c?view=diff&rev=139342&r1=139341&r2=139342
==============================================================================
--- team/jdixon/chan_usbradio-1.4/dev-1.0/channels/chan_echolink.c (original)
+++ team/jdixon/chan_usbradio-1.4/dev-1.0/channels/chan_echolink.c Thu Aug 21 17:28:51 2008
@@ -31,7 +31,7 @@
 /*** MODULEINFO
  ***/
 
-/* Version 0.4, 08/21/2008
+/* Version 0.5, 08/21/2008
 Echolink channel driver for Asterisk/app_rpt.
 This is a second attempt.
 A lot more has to be added,
@@ -362,7 +362,7 @@
     struct rtcp_t *rp;
     unsigned char *ap;
     char line[EL_CALL_SIZE + EL_NAME_SIZE + 1];
-    int l, hl;
+    int l, hl, pl;
 
     hl = 0;
     *p++ = 3 << 6;
@@ -404,7 +404,7 @@
     rp->common.length = htons(((l + 3) / 4) - 1);
     l = hl + ((ntohs(rp->common.length) + 1) * 4);
 
-    int pl = (l & 4) ? l : l + 4;
+    pl = (l & 4) ? l : l + 4;
 
     if (pl > l) {
        int pad = pl - l;
@@ -425,7 +425,7 @@
 {
     struct rtcp_t *rp;
     unsigned char *ap, *zp;
-    int l, hl;
+    int l, hl, pl;
 
     zp = p;
     hl = 0;
@@ -457,7 +457,7 @@
     rp->common.length = htons((l / 4) - 1);
     l = hl + ((ntohs(rp->common.length) + 1) * 4);
 
-    int pl = (l & 4) ? l : l + 4;
+    pl = (l & 4) ? l : l + 4;
     if (pl > l) {
        int pad = pl - l;
        memset(zp + l, '\0', pad);
@@ -1185,7 +1185,7 @@
 		{
 			char tmpstr[30];
 
-			sprintf(tmpstr,"3%u",nodenum);
+			sprintf(tmpstr,"3%06u",nodenum);
 			ast_set_callerid(tmp,tmpstr,NULL,NULL);
 		}
 		i->owner = tmp;