Added get_port() method to socket_t to learn the listening port.

diff --git a/src/libcharon/network/socket.h b/src/libcharon/network/socket.h
index be875035bb4debf7de542a5794e772fb2b38890e..4a4ef52e6aa2c8b88a0f1446fbce0ea8fd05e51e 100644 (file)
--- a/src/libcharon/network/socket.h
+++ b/src/libcharon/network/socket.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Tobias Brunner
+ * Copyright (C) 2006-2012 Tobias Brunner
  * Copyright (C) 2005-2010 Martin Willi
  * Copyright (C) 2006 Daniel Roethlisberger
  * Copyright (C) 2005 Jan Hutter
@@ -67,6 +67,14 @@ struct socket_t {
         */
        status_t (*send) (socket_t *this, packet_t *packet);
 
+       /**
+        * Get the port this socket is listening on.
+        *
+        * @param nat_t                 TRUE to get the port used to float in case of NAT-T
+        * @return                              the port
+        */
+       u_int16_t (*get_port) (socket_t *this, bool nat_t);
+
        /**
         * Destroy a socket implementation.
         */

diff --git a/src/libcharon/network/socket_manager.c b/src/libcharon/network/socket_manager.c
index 72a45430122c171ebf8f4beaf206a836ea3b33b5..d2736de8ecb5764c50299dd7a64c19740fa0c6e1 100644 (file)
--- a/src/libcharon/network/socket_manager.c
+++ b/src/libcharon/network/socket_manager.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Tobias Brunner
+ * Copyright (C) 2010-2012 Tobias Brunner
  * Hochschule fuer Technik Rapperswil
  * Copyright (C) 2010 Martin Willi
  * Copyright (C) 2010 revosec AG
@@ -89,6 +89,19 @@ METHOD(socket_manager_t, sender, status_t,
        return status;
 }
 
+METHOD(socket_manager_t, get_port, u_int16_t,
+       private_socket_manager_t *this, bool nat_t)
+{
+       u_int16_t port = 0;
+       this->lock->read_lock(this->lock);
+       if (this->socket)
+       {
+               port = this->socket->get_port(this->socket, nat_t);
+       }
+       this->lock->unlock(this->lock);
+       return port;
+}
+
 static void create_socket(private_socket_manager_t *this)
 {
        socket_constructor_t create;
@@ -153,6 +166,7 @@ socket_manager_t *socket_manager_create()
                .public = {
                        .send = _sender,
                        .receive = _receiver,
+                       .get_port = _get_port,
                        .add_socket = _add_socket,
                        .remove_socket = _remove_socket,
                        .destroy = _destroy,

diff --git a/src/libcharon/network/socket_manager.h b/src/libcharon/network/socket_manager.h
index 94185d21ca8ea53977e92085a0503b29270db105..1909d1f25ded351be729d774a43dc744fa044bc2 100644 (file)
--- a/src/libcharon/network/socket_manager.h
+++ b/src/libcharon/network/socket_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010 Tobias Brunner
+ * Copyright (C) 2010-2012 Tobias Brunner
  * Hochschule fuer Technik Rapperswil
  * Copyright (C) 2010 Martin Willi
  * Copyright (C) 2010 revosec AG
@@ -52,6 +52,14 @@ struct socket_manager_t {
         */
        status_t (*send) (socket_manager_t *this, packet_t *packet);
 
+       /**
+        * Get the port the registered socket is listening on.
+        *
+        * @param nat_t                 TRUE to get the port used to float in case of NAT-T
+        * @return                              the port, or 0, if no socket is registered
+        */
+       u_int16_t (*get_port) (socket_manager_t *this, bool nat_t);
+
        /**
         * Register a socket constructor.
         *

diff --git a/src/libcharon/plugins/socket_default/socket_default_socket.c b/src/libcharon/plugins/socket_default/socket_default_socket.c
index 8da574a346062044bd03245e154e00dba5ae501d..beab3ea6bab18c960a94991affe6a631ef48f142 100644 (file)
--- a/src/libcharon/plugins/socket_default/socket_default_socket.c
+++ b/src/libcharon/plugins/socket_default/socket_default_socket.c
@@ -305,7 +305,7 @@ METHOD(socket_t, sender, status_t,
        /* send data */
        sport = src->get_port(src);
        family = dst->get_family(dst);
-       if (sport == CHARON_UDP_PORT)
+       if (sport == 0 || sport == CHARON_UDP_PORT)
        {
                if (family == AF_INET)
                {
@@ -405,6 +405,12 @@ METHOD(socket_t, sender, status_t,
        return SUCCESS;
 }
 
+METHOD(socket_t, get_port, u_int16_t,
+       private_socket_default_socket_t *this, bool nat_t)
+{
+       return nat_t ? CHARON_NATT_PORT : CHARON_UDP_PORT;
+}
+
 /**
  * open a socket to send and receive packets
  */
@@ -533,6 +539,7 @@ socket_default_socket_t *socket_default_socket_create()
                        .socket = {
                                .send = _sender,
                                .receive = _receiver,
+                               .get_port = _get_port,
                                .destroy = _destroy,
                        },
                },

diff --git a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
index 3c3b17bf336473b645feed5d24fe8c14bda28983..e0e0af6b67b907b64c6df2f69db6ce58a1ebd774 100644 (file)
--- a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
+++ b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
@@ -467,6 +467,7 @@ METHOD(socket_t, sender, status_t,
        dst = packet->get_destination(packet);
        family = src->get_family(src);
        port = src->get_port(src);
+       port = port ?: CHARON_UDP_PORT;
        skt = find_socket(this, family, port);
        if (!skt)
        {
@@ -534,6 +535,14 @@ METHOD(socket_t, sender, status_t,
        return SUCCESS;
 }
 
+METHOD(socket_t, get_port, u_int16_t,
+       private_socket_dynamic_socket_t *this, bool nat_t)
+{
+       /* we return 0 here for users that have no explicit port configured, the
+        * sender will default to the default port in this case */
+       return 0;
+}
+
 METHOD(socket_t, destroy, void,
        private_socket_dynamic_socket_t *this)
 {
@@ -567,6 +576,7 @@ socket_dynamic_socket_t *socket_dynamic_socket_create()
                        .socket = {
                                .send = _sender,
                                .receive = _receiver,
+                               .get_port = _get_port,
                                .destroy = _destroy,
                        },
                },

diff --git a/src/libcharon/plugins/socket_raw/socket_raw_socket.c b/src/libcharon/plugins/socket_raw/socket_raw_socket.c
index 37d13f13f1bb6d142c2bd0a2f886ddc61858b65d..1b3c9e12635486f3e85fc8aca9b653ca734b5281 100644 (file)
--- a/src/libcharon/plugins/socket_raw/socket_raw_socket.c
+++ b/src/libcharon/plugins/socket_raw/socket_raw_socket.c
@@ -309,7 +309,7 @@ METHOD(socket_t, sender, status_t,
        /* send data */
        sport = src->get_port(src);
        family = dst->get_family(dst);
-       if (sport == CHARON_UDP_PORT)
+       if (sport == 0 || sport == CHARON_UDP_PORT)
        {
                if (family == AF_INET)
                {
@@ -470,6 +470,12 @@ static int open_send_socket(private_socket_raw_socket_t *this,
        return skt;
 }
 
+METHOD(socket_t, get_port, u_int16_t,
+       private_socket_raw_socket_t *this, bool nat_t)
+{
+       return nat_t ? CHARON_NATT_PORT : CHARON_UDP_PORT;
+}
+
 /**
  * open a socket to receive packets
  */
@@ -616,6 +622,7 @@ socket_raw_socket_t *socket_raw_socket_create()
                        .socket = {
                                .send = _sender,
                                .receive = _receiver,
+                               .get_port = _get_port,
                                .destroy = _destroy,
                        },
                },