X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fsyscall_netadd-net.hc;h=e7e710520dbd3316717e283dc40c478629b68d08;hb=5b4184f854cb12f32149608868295e847191ef4a;hp=f408d90f4554d81e2746fa45fbaa3657aac99e84;hpb=9c78378bebc1a9f3d400f422df8ede9efea57dea;p=util-vserver.git diff --git a/lib/syscall_netadd-net.hc b/lib/syscall_netadd-net.hc index f408d90..e7e7105 100644 --- a/lib/syscall_netadd-net.hc +++ b/lib/syscall_netadd-net.hc @@ -21,17 +21,31 @@ #endif static inline ALWAYSINLINE int -vc_net_add_net(nid_t nid, struct vc_net_nx const *info) +vc_net_add_net(nid_t nid, struct vc_net_addr const *info) { struct vcmd_net_addr_v0 k_info; size_t i; - k_info.type = NETTYPE_USER2KERNEL(info->type); - k_info.count = info->count; - for (i = 0; i < sizeof(k_info.ip) / sizeof(*k_info.ip); i++) - k_info.ip[i] = info->ip[i]; - for (i = 0; i < sizeof(k_info.mask) / sizeof(*k_info.mask); i++) - k_info.mask[i] = info->mask[i]; - - return vserver(VCMD_net_add, NID_USER2KERNEL(nid), &k_info); + k_info.type = info->vna_type & (VC_NXA_TYPE_IPV4|VC_NXA_TYPE_IPV6|VC_NXA_MOD_BCAST); + k_info.count = 1; + + if ((k_info.type | VC_NXA_TYPE_ADDR) != info->vna_type) { + errno = EINVAL; + return -1; + } + + switch (k_info.type) { + case VC_NXA_TYPE_IPV4: + case VC_NXA_TYPE_IPV4 | VC_NXA_MOD_BCAST: + k_info.ip[0].s_addr = info->vna_v4_ip.s_addr; + k_info.mask[0].s_addr = info->vna_v4_mask.s_addr; + break; + case VC_NXA_TYPE_IPV6: + for (i = 0; i < 4; i++) + k_info.ip[i].s_addr = info->vna_v6_ip.s6_addr32[i]; + k_info.mask[0].s_addr = info->vna_prefix; + break; + } + + return vserver(VCMD_net_add_v0, NID_USER2KERNEL(nid), &k_info); }