denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ts.get_subnet() returns TRUE if the selector actually is a subnet

Browse Source
This commit is contained in:
Martin Willi
2012-03-20 17:30:44 +01:00
parent 26b55dc6c8
commit 764ee21d83
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/selectors/traffic_selector.c
+4 -2
View File
@@ -571,7 +571,7 @@ METHOD(traffic_selector_t, includes, bool,
return FALSE; return FALSE;
} }
METHOD(traffic_selector_t, to_subnet, void, METHOD(traffic_selector_t, to_subnet, bool,
private_traffic_selector_t *this, host_t **net, u_int8_t *mask) private_traffic_selector_t *this, host_t **net, u_int8_t *mask)
{ {
/* there is no way to do this cleanly, as the address range may /* there is no way to do this cleanly, as the address range may
@@ -597,7 +597,7 @@ METHOD(traffic_selector_t, to_subnet, void,
break; break;
default: default:
/* unreachable */ /* unreachable */
return; return FALSE;
} }
net_chunk.ptr = malloc(net_chunk.len); net_chunk.ptr = malloc(net_chunk.len);
@@ -616,6 +616,8 @@ METHOD(traffic_selector_t, to_subnet, void,
*net = host_create_from_chunk(family, net_chunk, port); *net = host_create_from_chunk(family, net_chunk, port);
chunk_free(&net_chunk); chunk_free(&net_chunk);
return this->netbits != NON_SUBNET_ADDRESS_RANGE;
} }
METHOD(traffic_selector_t, clone_, traffic_selector_t*, METHOD(traffic_selector_t, clone_, traffic_selector_t*,
src/libstrongswan/selectors/traffic_selector.h
+2 -1
View File
@@ -203,8 +203,9 @@ struct traffic_selector_t {
* *
* @param net converted subnet (has to be freed) * @param net converted subnet (has to be freed)
* @param mask converted net mask * @param mask converted net mask
* @return TRUE if traffic selector matches exactly to the subnet
*/ */
void (*to_subnet) (traffic_selector_t *this, host_t **net, u_int8_t *mask); bool (*to_subnet) (traffic_selector_t *this, host_t **net, u_int8_t *mask);
/** /**
* Destroys the ts object * Destroys the ts object