[pisa-src] r1764 - in trunk: libpisa/conmgr.c libpisa/conmgr.h pisacd/cdservers.c pisasd/sdregister.c

From: Thomas Jansen <mithi@xxxxxxxxx>
To: pisa-src@xxxxxxxxxxxxx
Date: Tue, 24 Nov 2009 15:18:45 +0100
Author: tjansen
Date: Tue Nov 24 15:18:45 2009
New Revision: 1764

Log:
Set the connection type in pisa_conmgr_add.

Previously we had to do it manually in different places.

Modified:
   trunk/libpisa/conmgr.c
   trunk/libpisa/conmgr.h
   trunk/pisacd/cdservers.c
   trunk/pisasd/sdregister.c

Modified: trunk/libpisa/conmgr.c
==============================================================================
--- trunk/libpisa/conmgr.c      Tue Nov 24 11:13:11 2009        (r1763)
+++ trunk/libpisa/conmgr.c      Tue Nov 24 15:18:45 2009        (r1764)
@@ -101,10 +101,11 @@
  * @return pointer to the new assocation
  * @sa pisa_conmgr_remove
  */
-pisa_conmgr_entry* pisa_conmgr_add(pisa_conmgr_list *conlist, const struct 
in6_addr* hit, int ctrl_port)
+pisa_conmgr_entry* pisa_conmgr_add(pisa_conmgr_list *conlist, const struct 
in6_addr* hit, int ctrl_port, pisa_contype type)
 {
        pisa_conmgr_entry* entry = pisa_conmgr_new();
 
+       entry->type = type;
        entry->control_port = ctrl_port;
        pisa_ipv6_copy(&entry->hit, hit);
        entry->timeout_flag = 0;

Modified: trunk/libpisa/conmgr.h
==============================================================================
--- trunk/libpisa/conmgr.h      Tue Nov 24 11:13:11 2009        (r1763)
+++ trunk/libpisa/conmgr.h      Tue Nov 24 15:18:45 2009        (r1764)
@@ -119,7 +119,7 @@
 pisa_conmgr_list *pisa_conmgr_init(pisa_conmgr_connection_remove_callback 
callback);
 void pisa_conmgr_cleanup(pisa_conmgr_list **conlist, struct pisa_nat_list 
*natlist);
 
-pisa_conmgr_entry* pisa_conmgr_add(pisa_conmgr_list *conlist, const struct 
in6_addr* client_addr, int ctrl_port);
+pisa_conmgr_entry* pisa_conmgr_add(pisa_conmgr_list *conlist, const struct 
in6_addr* client_addr, int ctrl_port, pisa_contype type);
 void pisa_conmgr_connected(pisa_conmgr_list *conlist, pisa_conmgr_entry* 
entry, unsigned short data_port, struct in_addr *client_ipv4);
 void pisa_conmgr_remove(pisa_conmgr_list *conlist, struct pisa_nat_list 
*natlist, pisa_conmgr_entry* entry);
 

Modified: trunk/pisacd/cdservers.c
==============================================================================
--- trunk/pisacd/cdservers.c    Tue Nov 24 11:13:11 2009        (r1763)
+++ trunk/pisacd/cdservers.c    Tue Nov 24 15:18:45 2009        (r1764)
@@ -39,8 +39,7 @@
 {
        pisa_conmgr_entry *entry = NULL;
 
-       entry = pisa_conmgr_add(cd_ctx.conlist, hit, port);
-       entry->type = type;
+       entry = pisa_conmgr_add(cd_ctx.conlist, hit, port, type);
        if (type == PISA_CONTYPE_RELAY)
                pisa_client_connect_to_server(entry);
 

Modified: trunk/pisasd/sdregister.c
==============================================================================
--- trunk/pisasd/sdregister.c   Tue Nov 24 11:13:11 2009        (r1763)
+++ trunk/pisasd/sdregister.c   Tue Nov 24 15:18:45 2009        (r1764)
@@ -49,9 +49,8 @@
        pisa_conmgr_entry *entry;
        struct timeval delay;
 
-       entry = pisa_conmgr_add(sd_ctx.conlist, &addr->sin6_addr, 
ntohs(addr->sin6_port));
+       entry = pisa_conmgr_add(sd_ctx.conlist, &addr->sin6_addr, 
ntohs(addr->sin6_port), type);
        pisa_conmgr_connected(sd_ctx.conlist, entry, 
PISASD_DEFAULT_PORTNUM_DATA, client_ipv4);
-       entry->type = type;
        pisa_send_register_ack(entry);
        entry->status = PISA_CON_CONNECTED;
[pisa-src] r1764 - in trunk: libpisa/conmgr.c libpisa/conmgr.h pisacd/cdservers.c pisasd/sdregister.c

Other related posts:
