Replaced usages of CHARON_*_PORT with calls to get_port().

diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
index affe281fa2aa46189d6f30cfebf309d781dc0445..ccfa210a02f4ec6355e56068f6cd86b423bcb56d 100644 (file)
--- a/src/charon-nm/nm/nm_service.c
+++ b/src/charon-nm/nm/nm_service.c
@@ -497,7 +497,8 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
        /**
         * Set up configurations
         */
-       ike_cfg = ike_cfg_create(TRUE, encap, "0.0.0.0", FALSE, CHARON_UDP_PORT,
+       ike_cfg = ike_cfg_create(TRUE, encap, "0.0.0.0", FALSE,
+                                                        charon->socket->get_port(charon->socket, FALSE),
                                                        (char*)address, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
        peer_cfg = peer_cfg_create(priv->name, IKEV2, ike_cfg,

diff --git a/src/libcharon/plugins/android/android_service.c b/src/libcharon/plugins/android/android_service.c
index c5553f24f9b6d96a7009c536a51826034f93f338..f2d8ddce980950b9e12fd8442433dd7b9e4b652f 100644 (file)
--- a/src/libcharon/plugins/android/android_service.c
+++ b/src/libcharon/plugins/android/android_service.c
@@ -264,7 +264,8 @@ static job_requeue_t initiate(private_android_service_t *this)
                this->creds->set_username_password(this->creds, user, password);
        }
 
-       ike_cfg = ike_cfg_create(TRUE, FALSE, "0.0.0.0", FALSE, CHARON_UDP_PORT,
+       ike_cfg = ike_cfg_create(TRUE, FALSE, "0.0.0.0", FALSE,
+                                                        charon->socket->get_port(charon->socket, FALSE),
                                                         hostname, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
 

diff --git a/src/libcharon/plugins/ha/ha_tunnel.c b/src/libcharon/plugins/ha/ha_tunnel.c
index 200733cac8045d4e6bc15f4b27e0278f0760e137..ad458caad84c6eede4a6891f3efd7062e6afbb0d 100644 (file)
--- a/src/libcharon/plugins/ha/ha_tunnel.c
+++ b/src/libcharon/plugins/ha/ha_tunnel.c
@@ -203,7 +203,8 @@ static void setup_tunnel(private_ha_tunnel_t *this,
        lib->credmgr->add_set(lib->credmgr, &this->creds.public);
 
        /* create config and backend */
-       ike_cfg = ike_cfg_create(FALSE, FALSE, local, FALSE, CHARON_UDP_PORT,
+       ike_cfg = ike_cfg_create(FALSE, FALSE, local, FALSE,
+                                                        charon->socket->get_port(charon->socket, FALSE),
                                                         remote, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
        peer_cfg = peer_cfg_create("ha", IKEV2, ike_cfg, CERT_NEVER_SEND,

diff --git a/src/libcharon/plugins/load_tester/load_tester_config.c b/src/libcharon/plugins/load_tester/load_tester_config.c
index 2e02fb57cc4a9deb68cc095cb81e0285dcb183cf..f5da8b8928b7f9d67b61f88bc635b00f606d67f4 100644 (file)
--- a/src/libcharon/plugins/load_tester/load_tester_config.c
+++ b/src/libcharon/plugins/load_tester/load_tester_config.c
@@ -257,7 +257,7 @@ static peer_cfg_t* generate_config(private_load_tester_config_t *this, uint num)
        else
        {
                ike_cfg = ike_cfg_create(FALSE, FALSE,
-                                                                this->local, FALSE, CHARON_UDP_PORT,
+                                                                this->local, FALSE, charon->socket->get_port(charon->socket, FALSE),
                                                                 this->remote, FALSE, IKEV2_UDP_PORT);
        }
        ike_cfg->add_proposal(ike_cfg, this->proposal->clone(this->proposal));

diff --git a/src/libcharon/plugins/maemo/maemo_service.c b/src/libcharon/plugins/maemo/maemo_service.c
index 9f1f16956b646ccbbed89fd91eb84faa3693e50a..f638a81b7dbe42d1145a1c56e13aca5c7a3d0cd6 100644 (file)
--- a/src/libcharon/plugins/maemo/maemo_service.c
+++ b/src/libcharon/plugins/maemo/maemo_service.c
@@ -323,7 +323,8 @@ static gboolean initiate_connection(private_maemo_service_t *this,
                                                                NULL);
        }
 
-       ike_cfg = ike_cfg_create(TRUE, FALSE, "0.0.0.0", FALSE, CHARON_UDP_PORT,
+       ike_cfg = ike_cfg_create(TRUE, FALSE, "0.0.0.0", FALSE,
+                                                        charon->socket->get_port(charon->socket, FALSE),
                                                         hostname, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
 

diff --git a/src/libcharon/plugins/medcli/medcli_config.c b/src/libcharon/plugins/medcli/medcli_config.c
index 6b28f751c6d20447099131ee7afa6d587a57f3aa..829c8f05eac32eef2cbb4f56165d1aed5aa28cb1 100644 (file)
--- a/src/libcharon/plugins/medcli/medcli_config.c
+++ b/src/libcharon/plugins/medcli/medcli_config.c
@@ -119,7 +119,7 @@ METHOD(backend_t, get_peer_cfg_by_name, peer_cfg_t*,
                return NULL;
        }
        ike_cfg = ike_cfg_create(FALSE, FALSE,
-                                                        "0.0.0.0", FALSE, CHARON_UDP_PORT,
+                                                        "0.0.0.0", FALSE, charon->socket->get_port(charon->socket, FALSE),
                                                         address, FALSE, IKEV2_UDP_PORT);
        ike_cfg->add_proposal(ike_cfg, proposal_create_default(PROTO_IKE));
        med_cfg = peer_cfg_create(
@@ -396,7 +396,7 @@ medcli_config_t *medcli_config_create(database_t *db)
                .rekey = lib->settings->get_time(lib->settings, "medcli.rekey", 1200),
                .dpd = lib->settings->get_time(lib->settings, "medcli.dpd", 300),
                .ike = ike_cfg_create(FALSE, FALSE,
-                                                         "0.0.0.0", FALSE, CHARON_UDP_PORT,
+                                                         "0.0.0.0", FALSE, charon->socket->get_port(charon->socket, FALSE),
                                                          "0.0.0.0", FALSE, IKEV2_UDP_PORT),
        );
        this->ike->add_proposal(this->ike, proposal_create_default(PROTO_IKE));

diff --git a/src/libcharon/plugins/medsrv/medsrv_config.c b/src/libcharon/plugins/medsrv/medsrv_config.c
index b19847b870e3b151c167f19eb25c86b3b9ba64c4..ebc142de2162665475d16a775c2ed350cfc26b73 100644 (file)
--- a/src/libcharon/plugins/medsrv/medsrv_config.c
+++ b/src/libcharon/plugins/medsrv/medsrv_config.c
@@ -141,7 +141,7 @@ medsrv_config_t *medsrv_config_create(database_t *db)
                .rekey = lib->settings->get_time(lib->settings, "medsrv.rekey", 1200),
                .dpd = lib->settings->get_time(lib->settings, "medsrv.dpd", 300),
                .ike = ike_cfg_create(FALSE, FALSE,
-                                                         "0.0.0.0", FALSE, CHARON_UDP_PORT,
+                                                         "0.0.0.0", FALSE, charon->socket->get_port(charon->socket, FALSE),
                                                          "0.0.0.0", FALSE, IKEV2_UDP_PORT),
        );
        this->ike->add_proposal(this->ike, proposal_create_default(PROTO_IKE));

diff --git a/src/libcharon/plugins/sql/sql_config.c b/src/libcharon/plugins/sql/sql_config.c
index 28b493e7a016e28cdfa64658da037a50a6403950..890077157fbdf83985ddf566885c63872efdd2b0 100644 (file)
--- a/src/libcharon/plugins/sql/sql_config.c
+++ b/src/libcharon/plugins/sql/sql_config.c
@@ -259,7 +259,7 @@ static ike_cfg_t *build_ike_cfg(private_sql_config_t *this, enumerator_t *e,
                ike_cfg_t *ike_cfg;
 
                ike_cfg = ike_cfg_create(certreq, force_encap,
-                                                                local, FALSE, CHARON_UDP_PORT,
+                                                                local, FALSE, charon->socket->get_port(charon->socket, FALSE),
                                                                 remote, FALSE, IKEV2_UDP_PORT);
                add_ike_proposals(this, ike_cfg, id);
                return ike_cfg;

diff --git a/src/libcharon/plugins/stroke/stroke_config.c b/src/libcharon/plugins/stroke/stroke_config.c
index 83f04bd382b41b01b0f5be5c99ace9e0b2b885ed..bf93f2c3410d63337cc57a0592673fe4a9c36841 100644 (file)
--- a/src/libcharon/plugins/stroke/stroke_config.c
+++ b/src/libcharon/plugins/stroke/stroke_config.c
@@ -226,7 +226,8 @@ static ike_cfg_t *build_ike_cfg(private_stroke_config_t *this, stroke_msg_t *msg
                }
        }
        ikeport = msg->add_conn.me.ikeport;
-       ikeport = (ikeport == IKEV2_UDP_PORT) ? CHARON_UDP_PORT : ikeport;
+       ikeport = (ikeport == IKEV2_UDP_PORT) ?
+                          charon->socket->get_port(charon->socket, FALSE) : ikeport;
        ike_cfg = ike_cfg_create(msg->add_conn.other.sendcert != CERT_NEVER_SEND,
                                                         msg->add_conn.force_encap,
                                                         msg->add_conn.me.address,

diff --git a/src/libcharon/plugins/uci/uci_config.c b/src/libcharon/plugins/uci/uci_config.c
index 9dc0cfcde508e93462835034075ee828dec39d71..5b698b8b297e8dbb0222f5b12677cef0e0d3e49f 100644 (file)
--- a/src/libcharon/plugins/uci/uci_config.c
+++ b/src/libcharon/plugins/uci/uci_config.c
@@ -169,7 +169,7 @@ METHOD(enumerator_t, peer_enumerator_enumerate, bool,
        {
                DESTROY_IF(this->peer_cfg);
                ike_cfg = ike_cfg_create(FALSE, FALSE,
-                                                                local_addr, FALSE, CHARON_UDP_PORT,
+                                                                local_addr, FALSE, charon->socket->get_port(charon->socket, FALSE),
                                                                 remote_addr, FALSE, IKEV2_UDP_PORT);
                ike_cfg->add_proposal(ike_cfg, create_proposal(ike_proposal, PROTO_IKE));
                this->peer_cfg = peer_cfg_create(
@@ -267,7 +267,7 @@ METHOD(enumerator_t, ike_enumerator_enumerate, bool,
        {
                DESTROY_IF(this->ike_cfg);
                this->ike_cfg = ike_cfg_create(FALSE, FALSE,
-                                                                          local_addr, FALSE, CHARON_UDP_PORT,
+                                                                          local_addr, FALSE, charon->socket->get_port(charon->socket, FALSE),
                                                                           remote_addr, FALSE, IKEV2_UDP_PORT);
                this->ike_cfg->add_proposal(this->ike_cfg,
                                                                        create_proposal(ike_proposal, PROTO_IKE));

diff --git a/src/libcharon/processing/jobs/migrate_job.c b/src/libcharon/processing/jobs/migrate_job.c
index 6e5b4af0ddfee209dcc029ddef83da88b7213fcc..57f3449800daadb4295b6144759579337415955f 100644 (file)
--- a/src/libcharon/processing/jobs/migrate_job.c
+++ b/src/libcharon/processing/jobs/migrate_job.c
@@ -97,7 +97,7 @@ METHOD(job_t, execute, job_requeue_t,
                ike_sa->set_kmaddress(ike_sa, this->local, this->remote);
 
                host = this->local->clone(this->local);
-               host->set_port(host, CHARON_UDP_PORT);
+               host->set_port(host, charon->socket->get_port(charon->socket, FALSE));
                ike_sa->set_my_host(ike_sa, host);
 
                host = this->remote->clone(this->remote);

diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
index 755e5d74dfbabf93360ab53b293392155a446305..d9e4ca582d140ebf94e5b31ccd1dae248f0b0f60 100644 (file)
--- a/src/libcharon/sa/ike_sa.c
+++ b/src/libcharon/sa/ike_sa.c
@@ -845,9 +845,11 @@ METHOD(ike_sa_t, float_ports, void,
           private_ike_sa_t *this)
 {
        /* do not switch if we have a custom port from MOBIKE/NAT */
-       if (this->my_host->get_port(this->my_host) == CHARON_UDP_PORT)
+       if (this->my_host->get_port(this->my_host) ==
+                       charon->socket->get_port(charon->socket, FALSE))
        {
-               this->my_host->set_port(this->my_host, CHARON_NATT_PORT);
+               this->my_host->set_port(this->my_host,
+                                                               charon->socket->get_port(charon->socket, TRUE));
        }
        if (this->other_host->get_port(this->other_host) == IKEV2_UDP_PORT)
        {
@@ -1054,7 +1056,7 @@ static void resolve_hosts(private_ike_sa_t *this)
        if (this->local_host)
        {
                host = this->local_host->clone(this->local_host);
-               host->set_port(host, CHARON_UDP_PORT);
+               host->set_port(host, charon->socket->get_port(charon->socket, FALSE));
        }
        else
        {
@@ -2239,7 +2241,8 @@ ike_sa_t * ike_sa_create(ike_sa_id_t *ike_sa_id, bool initiator,
        }
 
        this->task_manager = task_manager_create(&this->public);
-       this->my_host->set_port(this->my_host, CHARON_UDP_PORT);
+       this->my_host->set_port(this->my_host,
+                                                       charon->socket->get_port(charon->socket, FALSE));
 
        if (!this->task_manager || !this->keymat)
        {

diff --git a/src/libcharon/sa/ikev1/tasks/informational.c b/src/libcharon/sa/ikev1/tasks/informational.c
index eee716c85a833c4c8c8311ad604b7739f33d6e3f..bda1d2afbab3b8bce45eac2c2d5f7ac3a407b725 100644 (file)
--- a/src/libcharon/sa/ikev1/tasks/informational.c
+++ b/src/libcharon/sa/ikev1/tasks/informational.c
@@ -116,7 +116,8 @@ METHOD(task_t, process_r, status_t,
                                                         notify_type_names, type, redirect);
                                                /* Cisco boxes reject the first message from 4500 */
                                                me = this->ike_sa->get_my_host(this->ike_sa);
-                                               me->set_port(me, CHARON_UDP_PORT);
+                                               me->set_port(me, charon->socket->get_port(
+                                                                                                               charon->socket, FALSE));
                                                this->ike_sa->set_other_host(this->ike_sa, redirect);
                                                this->ike_sa->reauth(this->ike_sa);
                                                enumerator->destroy(enumerator);

diff --git a/src/libcharon/sa/ikev2/tasks/ike_mobike.c b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
index 388b45c6899a8f8c42d592f4ef3853008d6f43cf..133bc296e3c755965b01ef1627b22238035c1090 100644 (file)
--- a/src/libcharon/sa/ikev2/tasks/ike_mobike.c
+++ b/src/libcharon/sa/ikev2/tasks/ike_mobike.c
@@ -277,9 +277,13 @@ static void apply_port(host_t *host, host_t *old, u_int16_t port, bool local)
        {
                port = old->get_port(old);
        }
-       else if (port == (local ? CHARON_UDP_PORT : IKEV2_UDP_PORT))
+       else if (local && port == charon->socket->get_port(charon->socket, FALSE))
        {
-               port = (local ? CHARON_NATT_PORT : IKEV2_NATT_PORT);
+               port = charon->socket->get_port(charon->socket, TRUE);
+       }
+       else if (!local && port == IKEV2_UDP_PORT)
+       {
+               port = IKEV2_NATT_PORT;
        }
        host->set_port(host, port);
 }