charon-cmd: add --local/remote-ts options to set traffic selectors

diff --git a/src/charon-cmd/cmd/cmd_connection.c b/src/charon-cmd/cmd/cmd_connection.c
index b3aad00ca4ce79f3c1c2691196f7de0d2a63ed25..33c01298b4bc6c9775961d3462e43b7bec67b74c 100644 (file)
--- a/src/charon-cmd/cmd/cmd_connection.c
+++ b/src/charon-cmd/cmd/cmd_connection.c
@@ -39,6 +39,16 @@ struct private_cmd_connection_t {
         */
        pid_t pid;
 
+       /**
+        * List of local traffic selectors
+        */
+       linked_list_t *local_ts;
+
+       /**
+        * List of remote traffic selectors
+        */
+       linked_list_t *remote_ts;
+
        /**
         * Hostname to connect to
         */
@@ -141,11 +151,22 @@ static child_cfg_t* create_child_cfg(private_cmd_connection_t *this)
                                                                 ACTION_NONE, ACTION_NONE, ACTION_NONE, FALSE,
                                                                 0, 0, NULL, NULL, 0);
        child_cfg->add_proposal(child_cfg, proposal_create_default(PROTO_ESP));
-       ts = traffic_selector_create_dynamic(0, 0, 65535);
-       child_cfg->add_traffic_selector(child_cfg, TRUE, ts);
-       ts = traffic_selector_create_from_string(0, TS_IPV4_ADDR_RANGE,
+       while (this->local_ts->remove_first(this->local_ts, (void**)&ts) == SUCCESS)
+       {
+               child_cfg->add_traffic_selector(child_cfg, TRUE, ts);
+       }
+       if (this->remote_ts->get_count(this->remote_ts) == 0)
+       {
+               /* add a 0.0.0.0/0 TS for remote side if none given */
+               ts = traffic_selector_create_from_string(0, TS_IPV4_ADDR_RANGE,
                                                                        "0.0.0.0", 0, "255.255.255.255", 65535);
-       child_cfg->add_traffic_selector(child_cfg, FALSE, ts);
+               this->remote_ts->insert_last(this->remote_ts, ts);
+       }
+       while (this->remote_ts->remove_first(this->remote_ts,
+                                                                                (void**)&ts) == SUCCESS)
+       {
+               child_cfg->add_traffic_selector(child_cfg, FALSE, ts);
+       }
 
        return child_cfg;
 }
@@ -186,6 +207,23 @@ static job_requeue_t initiate(private_cmd_connection_t *this)
        return JOB_REQUEUE_NONE;
 }
 
+/**
+ * Create a traffic selector from string, add to list
+ */
+static void add_ts(private_cmd_connection_t *this,
+                                  linked_list_t *list, char *string)
+{
+       traffic_selector_t *ts;
+
+       ts = traffic_selector_create_from_cidr(string, 0, 0, 65535);
+       if (!ts)
+       {
+               DBG1(DBG_CFG, "invalid traffic selector: %s", string);
+               exit(1);
+       }
+       list->insert_last(list, ts);
+}
+
 METHOD(cmd_connection_t, handle, bool,
        private_cmd_connection_t *this, cmd_option_type_t opt, char *arg)
 {
@@ -200,6 +238,12 @@ METHOD(cmd_connection_t, handle, bool,
                case CMD_OPT_RSA:
                        this->key_seen = TRUE;
                        break;
+               case CMD_OPT_LOCAL_TS:
+                       add_ts(this, this->local_ts, arg);
+                       break;
+               case CMD_OPT_REMOTE_TS:
+                       add_ts(this, this->remote_ts, arg);
+                       break;
                default:
                        return FALSE;
        }
@@ -209,6 +253,10 @@ METHOD(cmd_connection_t, handle, bool,
 METHOD(cmd_connection_t, destroy, void,
        private_cmd_connection_t *this)
 {
+       this->local_ts->destroy_offset(this->local_ts,
+                                                               offsetof(traffic_selector_t, destroy));
+       this->remote_ts->destroy_offset(this->remote_ts,
+                                                               offsetof(traffic_selector_t, destroy));
        free(this);
 }
 
@@ -225,8 +273,14 @@ cmd_connection_t *cmd_connection_create()
                        .destroy = _destroy,
                },
                .pid = getpid(),
+               .local_ts = linked_list_create(),
+               .remote_ts = linked_list_create(),
        );
 
+       /* always include the virtual IP in traffic selector list */
+       this->local_ts->insert_last(this->local_ts,
+                                                               traffic_selector_create_dynamic(0, 0, 65535));
+
        /* queue job, gets initiated as soon as we are up and running */
        lib->processor->queue_job(lib->processor,
                (job_t*)callback_job_create_with_prio(

diff --git a/src/charon-cmd/cmd/cmd_options.c b/src/charon-cmd/cmd/cmd_options.c
index 4344bf2372c3bce8773ade5e4057338056099bc1..f41819810d92fd7ebdcd0fdbd9e9f8a1430bd1fe 100644 (file)
--- a/src/charon-cmd/cmd/cmd_options.c
+++ b/src/charon-cmd/cmd/cmd_options.c
@@ -33,4 +33,8 @@ cmd_option_t cmd_options[CMD_OPT_COUNT] = {
          "trusted certificate, for authentication or trust chain validation" },
        { CMD_OPT_RSA, "rsa", required_argument, "path",
          "RSA private key to use for authentication" },
+       { CMD_OPT_LOCAL_TS, "local-ts", required_argument, "subnet",
+         "additional traffic selector to propose for our side" },
+       { CMD_OPT_REMOTE_TS, "remote-ts", required_argument, "subnet",
+         "remote traffic selector to propose for remote side" },
 };

diff --git a/src/charon-cmd/cmd/cmd_options.h b/src/charon-cmd/cmd/cmd_options.h
index 358108d0b56260c7a41d590eb10f1838d8783555..3756225bf5251ed1a4ea814d60d9a0d0235184ec 100644 (file)
--- a/src/charon-cmd/cmd/cmd_options.h
+++ b/src/charon-cmd/cmd/cmd_options.h
@@ -34,6 +34,8 @@ enum cmd_option_type_t {
        CMD_OPT_IDENTITY,
        CMD_OPT_CERT,
        CMD_OPT_RSA,
+       CMD_OPT_LOCAL_TS,
+       CMD_OPT_REMOTE_TS,
 
        CMD_OPT_COUNT
 };