| Message ID | b9b948c7e79e182befff1ad3d529b3e1e2f13101.1356094706.git.mprivozn@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 12/21/2012 05:59 AM, Michal Privoznik wrote: > Nowadays only basic information is reported. However, with the > current implementation much more can be exposed to users. like > broadcast/destination address (the former in case of standard > ethernet device, the latter in case of PPP interface), if the > interface is up, of type loopback, in promisc mode or capable of > sending multicast. > --- > > +++ b/qga/qapi-schema.json > @@ -480,26 +480,57 @@ > # > # @prefix: Network prefix length of @ip-address > # > -# Since: 1.1 > +# @dest-address: The broadcast or peer address. > +# > +# Since: 1.1, @dest-address since 1.3 Actually, since 1.4 now (1.3 is already out). > ## > { 'type': 'GuestIpAddress', > 'data': {'ip-address': 'str', > 'ip-address-type': 'GuestIpAddressType', > - 'prefix': 'int'} } > + 'prefix': 'int', > + '*dest-address': 'str'} } Is this field always going to be present in 1.4? If so, then it doesn't need to be marked optional (even though it wasn't present in 1.3). > ## > +# @GuestNetworkInterfaceType: > +# > +# @broadcast: Interface has a broadcast address. In which case it is > +# contained in @dest-address in @GuestIpAddress. > +# > +# @ppp: Interface is of point-to-point type. The peer address is then in > +# @dest-address in @GuestIpAddress. > +# > +# Since: 1.3 1.4 > +## > +{ 'enum': 'GuestNetworkInterfaceType', > + 'data': ['broadcast', 'ppp'] } > +## > # @GuestNetworkInterface: > # > # @name: The name of interface for which info are being delivered > # > +# @up: If the interface is up > +# > +# @loopback: If the interface is of loopback type > +# > +# @promisc: If the interface is in promiscuous mode > +# > +# @multicast: If the interface is cappable of multicast s/cappable/capable/ > +# > +# @type: If the interface has a broadcast address(-es) assigned, or is a PPP. > +# > # @hardware-address: Hardware address of @name > # > # @ip-addresses: List of addresses assigned to @name > # > -# Since: 1.1 > +# Since: 1.1, @up, @loopback, @promisc, @multicast and @type since 1.3 1.4 > ## > { 'type': 'GuestNetworkInterface', > 'data': {'name': 'str', > + 'up': 'bool', > + 'loopback': 'bool', > + 'promisc': 'bool', > + 'multicast': 'bool', > + '*type': 'GuestNetworkInterfaceType', Again, is this field optional? > '*hardware-address': 'str', > '*ip-addresses': ['GuestIpAddress'] } } > >
On 21.12.2012 19:43, Eric Blake wrote: > On 12/21/2012 05:59 AM, Michal Privoznik wrote: >> Nowadays only basic information is reported. However, with the >> current implementation much more can be exposed to users. like >> broadcast/destination address (the former in case of standard >> ethernet device, the latter in case of PPP interface), if the >> interface is up, of type loopback, in promisc mode or capable of >> sending multicast. >> --- >> > >> +++ b/qga/qapi-schema.json >> @@ -480,26 +480,57 @@ >> # >> # @prefix: Network prefix length of @ip-address >> # >> -# Since: 1.1 >> +# @dest-address: The broadcast or peer address. >> +# >> +# Since: 1.1, @dest-address since 1.3 > > Actually, since 1.4 now (1.3 is already out). > >> ## >> { 'type': 'GuestIpAddress', >> 'data': {'ip-address': 'str', >> 'ip-address-type': 'GuestIpAddressType', >> - 'prefix': 'int'} } >> + 'prefix': 'int', >> + '*dest-address': 'str'} } > > Is this field always going to be present in 1.4? If so, then it doesn't > need to be marked optional (even though it wasn't present in 1.3). Not really. This field is gonna be there iff guest agent is able to dig the info out. For instance, for PPP interfaces, I was unable to get peer's address via getifaddrs(). Other utilities use netlink for that. However, if interface has an broadcast address, this can be easily obtained via getifaddrs(). That's why I am making this optional for now. > >> ## >> +# @GuestNetworkInterfaceType: >> +# >> +# @broadcast: Interface has a broadcast address. In which case it is >> +# contained in @dest-address in @GuestIpAddress. >> +# >> +# @ppp: Interface is of point-to-point type. The peer address is then in >> +# @dest-address in @GuestIpAddress. >> +# >> +# Since: 1.3 > > 1.4 > >> +## >> +{ 'enum': 'GuestNetworkInterfaceType', >> + 'data': ['broadcast', 'ppp'] } >> +## >> # @GuestNetworkInterface: >> # >> # @name: The name of interface for which info are being delivered >> # >> +# @up: If the interface is up >> +# >> +# @loopback: If the interface is of loopback type >> +# >> +# @promisc: If the interface is in promiscuous mode >> +# >> +# @multicast: If the interface is cappable of multicast > > s/cappable/capable/ > >> +# >> +# @type: If the interface has a broadcast address(-es) assigned, or is a PPP. >> +# >> # @hardware-address: Hardware address of @name >> # >> # @ip-addresses: List of addresses assigned to @name >> # >> -# Since: 1.1 >> +# Since: 1.1, @up, @loopback, @promisc, @multicast and @type since 1.3 > > 1.4 > >> ## >> { 'type': 'GuestNetworkInterface', >> 'data': {'name': 'str', >> + 'up': 'bool', >> + 'loopback': 'bool', >> + 'promisc': 'bool', >> + 'multicast': 'bool', >> + '*type': 'GuestNetworkInterfaceType', > > Again, is this field optional? Yes. Because this actually tells type of 'dest-address' field which is optional I think this one should be optional as well. > >> '*hardware-address': 'str', >> '*ip-addresses': ['GuestIpAddress'] } } >> >> > Michal
diff --git a/qga/commands-posix.c b/qga/commands-posix.c index a657201..7717fbf 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -816,6 +816,11 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) } } + info->value->up = ifa->ifa_flags & IFF_UP; + info->value->loopback = ifa->ifa_flags & IFF_LOOPBACK; + info->value->promisc = ifa->ifa_flags & IFF_PROMISC; + info->value->multicast = ifa->ifa_flags & IFF_MULTICAST; + if (!info->value->has_hardware_address && ifa->ifa_flags & SIOCGIFHWADDR) { /* we haven't obtained HW address yet */ @@ -909,6 +914,66 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) continue; } + if (ifa->ifa_broadaddr && + ifa->ifa_flags & IFF_BROADCAST) { + /* interface has a broadcast address set */ + info->value->has_type = true; + info->value->type = GUEST_NETWORK_INTERFACE_TYPE_BROADCAST; + + if (ifa->ifa_addr->sa_family == AF_INET) { + /* and the broadcast is an IPv4 address */ + p = &((struct sockaddr_in *)ifa->ifa_broadaddr)->sin_addr; + if (!inet_ntop(AF_INET, p, addr4, sizeof(addr4))) { + snprintf(err_msg, sizeof(err_msg), + "inet_ntop failed : %s", strerror(errno)); + error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); + goto error; + } + address_item->value->dest_address = g_strdup(addr4); + address_item->value->has_dest_address = true; + } else { + /* or it is an IPv6 address */ + p = &((struct sockaddr_in6 *)ifa->ifa_broadaddr)->sin6_addr; + if (!inet_ntop(AF_INET6, p, addr6, sizeof(addr6))) { + snprintf(err_msg, sizeof(err_msg), + "inet_ntop failed : %s", strerror(errno)); + error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); + goto error; + } + address_item->value->dest_address = g_strdup(addr6); + address_item->value->has_dest_address = true; + } + } else if (ifa->ifa_dstaddr && + ifa->ifa_flags & IFF_POINTOPOINT) { + /* interface is point to point */ + info->value->has_type = true; + info->value->type = GUEST_NETWORK_INTERFACE_TYPE_PPP; + + if (ifa->ifa_addr->sa_family == AF_INET) { + /* and the peer has an IPv4 address */ + p = &((struct sockaddr_in *)ifa->ifa_dstaddr)->sin_addr; + if (!inet_ntop(AF_INET, p, addr4, sizeof(addr4))) { + snprintf(err_msg, sizeof(err_msg), + "inet_ntop failed : %s", strerror(errno)); + error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); + goto error; + } + address_item->value->dest_address = g_strdup(addr4); + address_item->value->has_dest_address = true; + } else { + /* or it has an IPv6 address */ + p = &((struct sockaddr_in6 *)ifa->ifa_dstaddr)->sin6_addr; + if (!inet_ntop(AF_INET6, p, addr6, sizeof(addr6))) { + snprintf(err_msg, sizeof(err_msg), + "inet_ntop failed : %s", strerror(errno)); + error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); + goto error; + } + address_item->value->dest_address = g_strdup(addr6); + address_item->value->has_dest_address = true; + } + } + address_list = &info->value->ip_addresses; while (*address_list && (*address_list)->next) { diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json index ed0eb69..066e6aa 100644 --- a/qga/qapi-schema.json +++ b/qga/qapi-schema.json @@ -480,26 +480,57 @@ # # @prefix: Network prefix length of @ip-address # -# Since: 1.1 +# @dest-address: The broadcast or peer address. +# +# Since: 1.1, @dest-address since 1.3 ## { 'type': 'GuestIpAddress', 'data': {'ip-address': 'str', 'ip-address-type': 'GuestIpAddressType', - 'prefix': 'int'} } + 'prefix': 'int', + '*dest-address': 'str'} } ## +# @GuestNetworkInterfaceType: +# +# @broadcast: Interface has a broadcast address. In which case it is +# contained in @dest-address in @GuestIpAddress. +# +# @ppp: Interface is of point-to-point type. The peer address is then in +# @dest-address in @GuestIpAddress. +# +# Since: 1.3 +## +{ 'enum': 'GuestNetworkInterfaceType', + 'data': ['broadcast', 'ppp'] } +## # @GuestNetworkInterface: # # @name: The name of interface for which info are being delivered # +# @up: If the interface is up +# +# @loopback: If the interface is of loopback type +# +# @promisc: If the interface is in promiscuous mode +# +# @multicast: If the interface is cappable of multicast +# +# @type: If the interface has a broadcast address(-es) assigned, or is a PPP. +# # @hardware-address: Hardware address of @name # # @ip-addresses: List of addresses assigned to @name # -# Since: 1.1 +# Since: 1.1, @up, @loopback, @promisc, @multicast and @type since 1.3 ## { 'type': 'GuestNetworkInterface', 'data': {'name': 'str', + 'up': 'bool', + 'loopback': 'bool', + 'promisc': 'bool', + 'multicast': 'bool', + '*type': 'GuestNetworkInterfaceType', '*hardware-address': 'str', '*ip-addresses': ['GuestIpAddress'] } }