shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-27 18:55:09 +03:00
Code

networkd: replace geneve/vxlan port parsing with generic config_parse_ip_port

Browse Source
This commit is contained in:
Susant Sahani 2017-04-27 10:44:22 +05:30
parent 177d0b2032
commit 9cdf4e3d7d
5 changed files with 2 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/network/netdev/geneve.c
View File

@ -238,36 +238,6 @@ int config_parse_geneve_address(const char *unit,
return 0;
}
int config_parse_geneve_destination_port(const char *unit,
const char *filename,
unsigned line,
const char *section,
unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
void *data,
void *userdata) {
Geneve *v = userdata;
uint16_t port;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = parse_ip_port(rvalue, &port);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse Geneve destination port '%s'.", rvalue);
return 0;
}
v->dest_port = port;
return 0;
}
int config_parse_geneve_flow_label(const char *unit,
const char *filename,
unsigned line,

11
src/network/netdev/geneve.h
View File

@ -73,17 +73,6 @@ int config_parse_geneve_address(const char *unit,
void *data,
void *userdata);
int config_parse_geneve_destination_port(const char *unit,
const char *filename,
unsigned line,
const char *section,
unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
void *data,
void *userdata);
int config_parse_geneve_flow_label(const char *unit,
const char *filename,
unsigned line,

4
src/network/netdev/netdev-gperf.gperf
View File

@ -79,7 +79,7 @@ VXLAN.FDBAgeingSec, config_parse_sec, 0,
VXLAN.GroupPolicyExtension, config_parse_bool, 0, offsetof(VxLan, group_policy)
VXLAN.MaximumFDBEntries, config_parse_unsigned, 0, offsetof(VxLan, max_fdb)
VXLAN.PortRange, config_parse_port_range, 0, 0
VXLAN.DestinationPort, config_parse_destination_port, 0, offsetof(VxLan, dest_port)
VXLAN.DestinationPort, config_parse_ip_port, 0, offsetof(VxLan, dest_port)
VXLAN.FlowLabel, config_parse_flow_label, 0, 0
GENEVE.Id, config_parse_geneve_vni, 0, offsetof(Geneve, id)
GENEVE.Remote, config_parse_geneve_address, 0, offsetof(Geneve, remote)
@ -88,7 +88,7 @@ GENEVE.TTL, config_parse_uint8, 0,
GENEVE.UDPChecksum, config_parse_bool, 0, offsetof(Geneve, udpcsum)
GENEVE.UDP6ZeroCheckSumRx, config_parse_bool, 0, offsetof(Geneve, udp6zerocsumrx)
GENEVE.UDP6ZeroCheckSumTx, config_parse_bool, 0, offsetof(Geneve, udp6zerocsumtx)
GENEVE.DestinationPort, config_parse_geneve_destination_port, 0, offsetof(Geneve, dest_port)
GENEVE.DestinationPort, config_parse_ip_port, 0, offsetof(Geneve, dest_port)
GENEVE.FlowLabel, config_parse_geneve_flow_label, 0, 0
Tun.OneQueue, config_parse_bool, 0, offsetof(TunTap, one_queue)
Tun.MultiQueue, config_parse_bool, 0, offsetof(TunTap, multi_queue)

30
src/network/netdev/vxlan.c
View File

@ -271,36 +271,6 @@ int config_parse_port_range(const char *unit,
return 0;
}
int config_parse_destination_port(const char *unit,
const char *filename,
unsigned line,
const char *section,
unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
void *data,
void *userdata) {
VxLan *v = userdata;
uint16_t port;
int r;
assert(filename);
assert(lvalue);
assert(rvalue);
assert(data);
r = parse_ip_port(rvalue, &port);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse VXLAN destination port '%s'.", rvalue);
return 0;
}
v->dest_port = port;
return 0;
}
int config_parse_flow_label(const char *unit,
const char *filename,
unsigned line,

11
src/network/netdev/vxlan.h
View File

@ -86,17 +86,6 @@ int config_parse_port_range(const char *unit,
void *data,
void *userdata);
int config_parse_destination_port(const char *unit,
const char *filename,
unsigned line,
const char *section,
unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
void *data,
void *userdata);
int config_parse_flow_label(const char *unit,
const char *filename,
unsigned line,