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

From: Diego Biurrun <diego@xxxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Sat, 28 Nov 2009 13:43:10 +0100
Author: biurrun
Date: Sat Nov 28 13:43:10 2009
New Revision: 1883

Log:
Revert exchange of pisasd definitions for pisacd definitions.
The initial situation was correct, pisacd uses pisasd there.

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 19:21:34 2009        (r1882)
+++ trunk/pisacd/cdconfhandlers.c       Sat Nov 28 13:43:10 2009        (r1883)
@@ -22,6 +22,7 @@
 #include "libpisa/packet.h"
 #include "libpisa/conmgr.h"
 #include "libpisa/nat.h"
+#include "pisasd/sdconf.h"
 #include "cdconfhandlers.h"
 #include "cdctx.h"
 #include "cdconf.h"
@@ -42,7 +43,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, 
PISACD_DEFAULT_PORTNUM_CONTROL, type);
+               entry = pisa_conmgr_add(cd_ctx.conlist, &serviceadd->hit, 
PISASD_DEFAULT_PORTNUM_CONTROL, type);
        }
 
        if (!entry)

Modified: trunk/pisacd/cdregister.c
==============================================================================
--- trunk/pisacd/cdregister.c   Fri Nov 27 19:21:34 2009        (r1882)
+++ trunk/pisacd/cdregister.c   Sat Nov 28 13:43:10 2009        (r1883)
@@ -12,6 +12,7 @@
  */
 
 #include "libpisa/tunnel.h"
+#include "pisasd/sdconf.h"
 #include "cdctx.h"
 #include "cdconf.h"
 #include "cdheartbeat.h"
@@ -151,7 +152,7 @@
                return;
        }
 
-       pisa_conmgr_connected(cd_ctx.conlist, entry, 
PISACD_DEFAULT_PORTNUM_DATA, &pkt->body.reg_ack.client);
+       pisa_conmgr_connected(cd_ctx.conlist, entry, 
PISASD_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 19:21:34 2009        (r1882)
+++ trunk/pisacd/cdservers.c    Sat Nov 28 13:43:10 2009        (r1883)
@@ -16,6 +16,7 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
+#include "pisasd/sdconf.h"
 #include "cdconf.h"
 #include "cdctx.h"
 #include "cdservers.h"
@@ -122,7 +123,7 @@
         * new one */
        entry = pisa_conmgr_findby_hit(cd_ctx.conlist, &hit);
        if (!entry) {
-               entry = pisa_conmgr_add(cd_ctx.conlist, &hit, 
PISACD_DEFAULT_PORTNUM_CONTROL, type);
+               entry = pisa_conmgr_add(cd_ctx.conlist, &hit, 
PISASD_DEFAULT_PORTNUM_CONTROL, type);
                if (!entry)
                        goto failed;
        }
[pisa-src] r1883 - in trunk/pisacd: cdconfhandlers.c cdregister.c cdservers.c

Other related posts:
