[pisa-src] r1386 - in trunk: pisacd/cdctx.h pisasd/sdctx.h

  • From: Thomas Jansen <mithi@xxxxxxxxx>
  • To: pisa-src@xxxxxxxxxxxxx
  • Date: Wed, 28 Oct 2009 15:57:11 +0100

Author: tjansen
Date: Wed Oct 28 15:57:11 2009
New Revision: 1386

Log:
Grouped sockets and file descriptors, added a comment to each one.

Modified:
   trunk/pisacd/cdctx.h
   trunk/pisasd/sdctx.h

Modified: trunk/pisacd/cdctx.h
==============================================================================
--- trunk/pisacd/cdctx.h        Wed Oct 28 15:49:45 2009        (r1385)
+++ trunk/pisacd/cdctx.h        Wed Oct 28 15:57:11 2009        (r1386)
@@ -34,17 +34,17 @@
        int flag_pending;               /* is there at least one pending event 
*/
 
        /**
-        * Sockets for the data port, control port and the tunnel device.
+        * File descriptors and sockets:
         */
-       int fd_data;
-       int fd_control;
-       int fd_tunnel;
-       pisa_conmgr_entry *defaultroute;
+       int fd_data;            /* data socket (UDP), forwards IP traffic */
+       int fd_control;         /* control socket (UDP), registering, heartbeat 
etc. */
+       int fd_tunnel;          /* tunnel device file descriptor */
+       int fd_pisaconf;        /* configuration utility socket */
 
        /**
-        * Socket for pisaconf
+        * The default route (for relay mode).
         */
-       int fd_pisaconf;
+       pisa_conmgr_entry *defaultroute;
 
        /**
         * Tunnel interface name.

Modified: trunk/pisasd/sdctx.h
==============================================================================
--- trunk/pisasd/sdctx.h        Wed Oct 28 15:49:45 2009        (r1385)
+++ trunk/pisasd/sdctx.h        Wed Oct 28 15:57:11 2009        (r1386)
@@ -33,16 +33,12 @@
        int flag_pending;               /* is there at least one pending event 
*/
 
        /**
-        * Sockets for the data port, control port and the tunnel device.
+        * File descriptors and sockets:
         */
-       int fd_data;
-       int fd_control;
-       int fd_tunnel;
-
-       /**
-        * Socket for pisaconf
-        */
-       int fd_pisaconf;
+       int fd_data;            /* data socket (UDP), forwards IP traffic */
+       int fd_control;         /* control socket (UDP), registering, heartbeat 
etc. */
+       int fd_tunnel;          /* tunnel device file descriptor */
+       int fd_pisaconf;        /* configuration utility socket */
 
        /**
         * Name of the pisa tunnel device

Other related posts:

  • » [pisa-src] r1386 - in trunk: pisacd/cdctx.h pisasd/sdctx.h - Thomas Jansen