[pisa-src] r1866 - in trunk/pisacd: cdconfhandlers.c cdregister.c cdservers.c

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: pisa-src@xxxxxxxxxxxxx
  • Date: Fri, 27 Nov 2009 14:41:40 +0100

Author: biurrun
Date: Fri Nov 27 14:41:40 2009
New Revision: 1866

Log:
Fix mistaken pisasd definitions used in pisacd code.

Modified:
   trunk/pisacd/cdconfhandlers.c
   trunk/pisacd/cdregister.c
   trunk/pisacd/cdservers.c

Modified: trunk/pisacd/cdconfhandlers.c
==============================================================================
--- trunk/pisacd/cdconfhandlers.c       Fri Nov 27 14:33:11 2009        (r1865)
+++ trunk/pisacd/cdconfhandlers.c       Fri Nov 27 14:41:40 2009        (r1866)
@@ -42,7 +42,7 @@
 
        if (!(entry = pisa_conmgr_findby_hit(cd_ctx.conlist, 
&serviceadd->hit))) {
                pisa_contype type = cd_cfg.flag_native ? PISA_CONTYPE_SERVICE : 
PISA_CONTYPE_LEGACY_ROUTER;
-               entry = pisa_conmgr_add(cd_ctx.conlist, &serviceadd->hit, 
PISASD_DEFAULT_PORTNUM_CONTROL, type);
+               entry = pisa_conmgr_add(cd_ctx.conlist, &serviceadd->hit, 
PISACD_DEFAULT_PORTNUM_CONTROL, type);
        }
 
        if (!entry)

Modified: trunk/pisacd/cdregister.c
==============================================================================
--- trunk/pisacd/cdregister.c   Fri Nov 27 14:33:11 2009        (r1865)
+++ trunk/pisacd/cdregister.c   Fri Nov 27 14:41:40 2009        (r1866)
@@ -151,7 +151,7 @@
                return;
        }
 
-       pisa_conmgr_connected(cd_ctx.conlist, entry, 
PISASD_DEFAULT_PORTNUM_DATA, &pkt->body.reg_ack.client);
+       pisa_conmgr_connected(cd_ctx.conlist, entry, 
PISACD_DEFAULT_PORTNUM_DATA, &pkt->body.reg_ack.client);
        entry->status = PISA_CON_CONNECTED;
        if (entry->type == PISA_CONTYPE_RELAY) {
                /* set up a second IPv4 address and a default route for the

Modified: trunk/pisacd/cdservers.c
==============================================================================
--- trunk/pisacd/cdservers.c    Fri Nov 27 14:33:11 2009        (r1865)
+++ trunk/pisacd/cdservers.c    Fri Nov 27 14:41:40 2009        (r1866)
@@ -122,7 +122,7 @@
         * new one */
        entry = pisa_conmgr_findby_hit(cd_ctx.conlist, &hit);
        if (!entry) {
-               entry = pisa_conmgr_add(cd_ctx.conlist, &hit, 
PISASD_DEFAULT_PORTNUM_CONTROL, type);
+               entry = pisa_conmgr_add(cd_ctx.conlist, &hit, 
PISACD_DEFAULT_PORTNUM_CONTROL, type);
                if (!entry)
                        goto failed;
        }

Other related posts: