diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ipcp_config.proto | 7 | ||||
| -rw-r--r-- | src/lib/irm.c | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/ipcp_config.proto b/src/lib/ipcp_config.proto index 9cbf1e49..185d9af7 100644 --- a/src/lib/ipcp_config.proto +++ b/src/lib/ipcp_config.proto @@ -40,12 +40,11 @@ message ipcp_config_msg { // Config for UDP optional uint32 ip_addr = 9; optional uint32 dns_addr = 10; - optional uint32 clt_port = 11; - optional uint32 srv_port = 12; + optional uint32 port = 11; // Config for the Ethernet - optional string dev = 13; + optional string dev = 12; // Config for DIX Ethernet - optional uint32 ethertype = 14; + optional uint32 ethertype = 13; } enum enroll_code { diff --git a/src/lib/irm.c b/src/lib/irm.c index 19bee4d2..b86b02c9 100644 --- a/src/lib/irm.c +++ b/src/lib/irm.c @@ -140,10 +140,8 @@ int irm_bootstrap_ipcp(pid_t pid, config.ip_addr = conf->ip_addr; config.has_dns_addr = true; config.dns_addr = conf->dns_addr; - config.has_srv_port = true; - config.srv_port = conf->srv_port; - config.has_clt_port = true; - config.clt_port = conf->clt_port; + config.has_port = true; + config.port = conf->port; break; case IPCP_LOCAL: case IPCP_BROADCAST: |