ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

handle right=%any case in strongSwan manager

This commit is contained in:
Andreas Steffen 2007-11-17 23:08:16 +00:00
parent b3b379e044
commit 3a19f38d15
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/charon/control/interfaces/xml_interface.c
View File

@ -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");

4
src/manager/controller/config_controller.c
View File

@ -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);
}
}

18
src/manager/templates/config/list.cs
View File

@ -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>