handle right=%any case in strongSwan manager

diff --git a/src/charon/control/interfaces/xml_interface.c b/src/charon/control/interfaces/xml_interface.c
index 8ec295f80448d177c7738767c4bf46571b79ec69..aa2a554a0b00df5bf5095308dfba6621d41c5e7a 100644 (file)
--- a/src/charon/control/interfaces/xml_interface.c
+++ b/src/charon/control/interfaces/xml_interface.c
@@ -91,6 +91,9 @@ static void write_id(xmlTextWriterPtr writer, char *element, identification_t *i
                        char *type = "";
                        while (TRUE)
                        {
+                               case ID_ANY:
+                                       type = "any";
+                                       break;
                                case ID_IPV4_ADDR:
                                        type = "ipv4";
                                        break;
@@ -114,9 +117,6 @@ static void write_id(xmlTextWriterPtr writer, char *element, identification_t *i
                        xmlTextWriterWriteFormatString(writer, "%D", id);
                        break;
                }
-               case ID_ANY:
-                       xmlTextWriterWriteAttribute(writer, "type", "any");
-                       break;
                default:
                        /* TODO: base64 keyid */
                        xmlTextWriterWriteAttribute(writer, "type", "keyid");

diff --git a/src/manager/controller/config_controller.c b/src/manager/controller/config_controller.c
index c5c96a070d69aadcda97ac0dbf956826b63d948e..e7941ada45178b970fc008ff3ad6d3e2fce40e55 100644 (file)
--- a/src/manager/controller/config_controller.c
+++ b/src/manager/controller/config_controller.c
@@ -70,6 +70,10 @@ static void process_peerconfig(private_config_controller_t *this,
                        {
                                if (streq(name, "local") || streq(name, "remote"))
                                {
+                                       if (streq(value, "0.0.0.0") || streq(value, "::"))
+                                       {
+                                               value = "%any";
+                                       }
                                        r->setf(r, "peercfgs.%s.ikecfg.%s=%s", config, name, value);
                                }
                        }

diff --git a/src/manager/templates/config/list.cs b/src/manager/templates/config/list.cs
index f944bd6c5bcf41dea4802e0c2de4072d590dc6ca..0a3dbd4cb6889b3ce8c440daeb87e44ffa194eb3 100644 (file)
--- a/src/manager/templates/config/list.cs
+++ b/src/manager/templates/config/list.cs
@@ -6,9 +6,13 @@
        <span><?cs var:peercfg.remote ?></span>
   </h1>
   <div class="controls">
-    <a title="initiate SA" href="<?cs var:base ?>/control/initiateike/<?cs name:peercfg ?>">
-      <img src="<?cs var:base ?>/static/initiate.png"/>
-    </a>
+    <?cs if:peercfg.remote != "%any" ?>
+      <a title="initiate SA" href="<?cs var:base ?>/control/initiateike/<?cs name:peercfg ?>">
+        <img src="<?cs var:base ?>/static/initiate.png"/>
+      </a>
+       <?cs else ?>
+      &nbsp;    
+    <?cs /if ?>
   </div>
   <div class="expander">
     <hr/>
@@ -17,9 +21,11 @@
     <div class="expand">
     <h1><?cs name:childcfg ?>:</h1>
          <div class="controls">
-               <a title="initiate SA" href="<?cs var:base ?>/control/initiatechild/<?cs name:childcfg ?>">
-                 <img src="<?cs var:base ?>/static/initiate.png"/>
-               </a>
+        <?cs if:peercfg.remote != "%any" ?>
+                 <a title="initiate SA" href="<?cs var:base ?>/control/initiatechild/<?cs name:childcfg ?>">
+                   <img src="<?cs var:base ?>/static/initiate.png"/>
+                 </a>
+        <?cs /if ?>
          </div>
     <div class="expander">
     <table>