qga/linux: Add new api 'guest-network-get-route'
v4 cover qga/linux: Add new api 'guest-network-get-route'
v3 -> v4
- Fix some indentation issues
- Update 'Since 8.2' to 'Since 9.1'
- Remove useless enum and adjust this change.
v2 -> v3
- Remove this declaration and make the function 'hexToIPAddress' as static.
- Define 'IFNAMSIZ' from kernel instead of a hardcode
- Remove 'GUEST_NETWORK_ROUTE_TYPE_LINUX'
- Set flags 'has_xxx' for checking if a field exists or has a value set
v1 -> v2
- Replace snprintf() to g_strdup_printf() to avoid memory problems.
- Remove the parameter 'char ipAddress[16]' in function 'char *hexToIPAddress()'.
- Add a piece of logic to skip traversing the first line of the file
Dehan Meng (1):
qga/linux: Add new api 'guest-network-get-route'
qga/commands-posix.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ qga/commands-win32.c | 6 ++++ qga/qapi-schema.json | 68 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+)
Signature · 1 line
2.40.1
PATCH v4 1/1 qga/linux: Add new api 'guest-network-get-route'
The Route information of the Linux VM needs to be used by administrators and users when debugging network problems and troubleshooting.
--- qga/commands-posix.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ qga/commands-win32.c | 6 ++++ qga/qapi-schema.json | 68 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+)
qga/commands-posix.c +73 -0
@@ -2747,6 +2747,73 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)return head; } +char *hexToIPAddress (unsigned int hexValue,char ipAddress[16 ]); +char *hexToIPAddress (unsigned int hexValue,char ipAddress[16 ]) +{ +unsigned int byte1 = (hexValue >>24 ) &0xFF ; +unsigned int byte2 = (hexValue >>16 ) &0xFF ; +unsigned int byte3 = (hexValue >>8 ) &0xFF ; +unsigned int byte4 = hexValue &0xFF ; + +snprintf (ipAddress,16 ,"%u.%u.%u.%u" , byte4, byte3, byte2, byte1); + +return ipAddress; +} + +GuestNetworkRouteStatList *qmp_guest_network_get_route (Error **errp) +{ +GuestNetworkRouteStatList *head =NULL , **tail = &head; +const char *routeFile ="/proc/net/route" ; +FILE *fp; +size_t n; +char *line =NULL ; + + fp =fopen (routeFile,"r" ); +if (fp ==NULL ) { +error_setg_errno (errp, errno,"open(\"%s\")" , routeFile); +return NULL ; + } + +while (getline (&line, &n, fp) !=-1 ) { +GuestNetworkRouteStat *networkroute; +int i; +char Iface[16 ]; +unsigned int Destination, Gateway, Mask, Flags; +int RefCnt, Use, Metric,MTU , Window,IRTT ; + + i = (sscanf (line,"%s %X %X %x %d %d %d %X %d %d %d" , + Iface, &Destination, &Gateway, &Flags, &RefCnt, + &Use, &Metric, &Mask, &MTU , &Window, &IRTT ) ==11 ); +if (i ==EOF ) { +continue ; + } + + networkroute =g_new0 (GuestNetworkRouteStat,1 ); + +char DestAddress[16 ]; +char GateAddress[16 ]; +char MaskAddress[16 ]; + + networkroute->iface =g_strdup (Iface); + networkroute->destination =g_strdup (hexToIPAddress (Destination, DestAddress)); + networkroute->gateway =g_strdup (hexToIPAddress (Gateway, GateAddress)); + networkroute->mask =g_strdup (hexToIPAddress (Mask, MaskAddress)); + networkroute->metric = Metric; + networkroute->flags = Flags; + networkroute->refcnt = RefCnt; + networkroute->use = Use; + networkroute->mtu =MTU ; + networkroute->window = Window; + networkroute->irtt =IRTT ; + +QAPI_LIST_APPEND (tail, networkroute); + } + +free (line); +fclose (fp); +return head; +} +#else /* defined(__linux__) */ void qmp_guest_suspend_disk (Error **errp)
@@ -3118,6 +3185,12 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp) return NULL; } +GuestNetworkRouteList *qmp_guest_network_get_route (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} +#endif /* CONFIG_FSFREEZE */ #if !defined(CONFIG_FSTRIM )
qga/commands-win32.c +6 -0
@@ -2522,3 +2522,9 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)error_setg (errp,QERR_UNSUPPORTED );return NULL ; } + +GuestNetworkRouteList *qmp_guest_network_get_route (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +}
qga/qapi-schema.json +68 -0
71 lines not on this page · raw message
Signature · 1 line
2.40.1
Quoted 178 lines · Dehan Meng
The Route information of the Linux VM needs to be used by administrators and users when debugging network problems and troubleshooting.
Signed-off-by Dehan Meng <[email protected]>--- qga/commands-posix.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ qga/commands-win32.c | 6 ++++ qga/qapi-schema.json | 68 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+)qga/commands-posix.c +67
-0@@ -2747,6 +2747,73 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)return head; } +char *hexToIPAddress (unsigned int hexValue,char ipAddress[16 ]); +char *hexToIPAddress (unsigned int hexValue,char ipAddress[16 ]) +{ +unsigned int byte1 = (hexValue >>24 ) &0xFF ; +unsigned int byte2 = (hexValue >>16 ) &0xFF ; +unsigned int byte3 = (hexValue >>8 ) &0xFF ; +unsigned int byte4 = hexValue &0xFF ; + +snprintf (ipAddress,16 ,"%u.%u.%u.%u" , byte4, byte3, byte2, byte1); + +return ipAddress; +} + +GuestNetworkRouteStatList *qmp_guest_network_get_route (Error **errp) +{ +GuestNetworkRouteStatList *head =NULL , **tail = &head; +const char *routeFile ="/proc/net/route" ; +FILE *fp; +size_t n; +char *line =NULL ; + + fp =fopen (routeFile,"r" ); +if (fp ==NULL ) { +error_setg_errno (errp, errno,"open(\"%s\")" , routeFile); +return NULL ; + } + +while (getline (&line, &n, fp) !=-1 ) { +GuestNetworkRouteStat *networkroute; +int i; +char Iface[16 ]; +unsigned int Destination, Gateway, Mask, Flags; +int RefCnt, Use, Metric,MTU , Window,IRTT ; + + i = (sscanf (line,"%s %X %X %x %d %d %d %X %d %d %d" , + Iface, &Destination, &Gateway, &Flags, &RefCnt, + &Use, &Metric, &Mask, &MTU , &Window, &IRTT ) ==11 ); +if (i ==EOF ) { +continue ; + } + + networkroute =g_new0 (GuestNetworkRouteStat,1 ); + +char DestAddress[16 ]; +char GateAddress[16 ]; +char MaskAddress[16 ]; + + networkroute->iface =g_strdup (Iface); + networkroute->destination =g_strdup (hexToIPAddress (Destination, DestAddress)); + networkroute->gateway =g_strdup (hexToIPAddress (Gateway, GateAddress)); + networkroute->mask =g_strdup (hexToIPAddress (Mask, MaskAddress)); + networkroute->metric = Metric; + networkroute->flags = Flags; + networkroute->refcnt = RefCnt; + networkroute->use = Use; + networkroute->mtu =MTU ; + networkroute->window = Window; + networkroute->irtt =IRTT ; + +QAPI_LIST_APPEND (tail, networkroute); + } + +free (line); +fclose (fp); +return head; +} +#else /*
defined(__linux__)*/void
qmp_guest_suspend_disk(Error **errp)qga/commands-posix.c +6
-0@@ -3118,6 +3185,12 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp) return NULL; } +GuestNetworkRouteList *qmp_guest_network_get_route (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +} +#endif /* CONFIG_FSFREEZE */ #if !defined(CONFIG_FSTRIM)
qga/commands-win32.c +6
-0@@ -2522,3 +2522,9 @@ GuestCpuStatsList *qmp_guest_get_cpustats(Error **errp)error_setg (errp,QERR_UNSUPPORTED );return NULL ; } + +GuestNetworkRouteList *qmp_guest_network_get_route (Error **errp) +{ +error_setg (errp,QERR_UNSUPPORTED ); +return NULL ; +}qga/qapi-schema.json +7
-0@@ -1789,3 +1789,71 @@ { 'command': 'guest-get-cpustats', 'returns': ['GuestCpuStats'] } + +## +# @GuestNetworkRouteStat: +# +# Route information, currently, only linux supported. +# +# @iface: The destination network or host's egress network interface inthe routing table
qga/qapi-schema.json +2
-0+# +# @destination: The IP address of the target network or host, The finaldestination of the packet
qga/qapi-schema.json +37
-0+# +# @gateway: The IP address of the next hop router +# +# @mask: Subnet Mask +# +# @metric: Route metricls +# +# @flags: Route flags (not for windows) +# +# @irtt: Initial round-trip delay (not for windows) +# +# @refcnt: The route's reference count (not for windows) +# +# @use: Route usage count (not for windows) +# +# @window: TCP window size, used for flow control (not for windows) +# +# @mtu: Data link layer maximum packet size (not for windows) +# +# Since: 9.1 + +## +{ 'struct': 'GuestNetworkRouteStat', + 'data': {'iface': 'str', + 'destination': 'str', + 'gateway': 'str', + 'metric': 'int', + 'mask': 'str', + '*irtt': 'int', + '*flags': 'uint64', + '*refcnt': 'int', + '*use': 'int', + '*window': 'int', + '*mtu': 'int' + }} + +##
qga/qapi-schema.json line 1847
Quoted 10 lines
qga/qapi-schema.json +10
-0+# @GuestNetworkRoute: +# +# Get route information of system. +# +# @routes: A list of network route information. +# +# Since: 9.1 +## +{ 'struct': 'GuestNetworkRoute', + 'data': { 'routes': ['GuestNetworkRouteStat'] } }
This struct is unused anymore, so remove it and rename GuestNetworkRouteStat to GuestNetworkRoute.
Quoted 16 lines
qga/qapi-schema.json +12
-1+ +## +# @guest-network-get-route: +# +# Retrieve information about route of network. +# Returns: List of route info of guest. +# +# Since: 9.1 +## +{ 'command': 'guest-network-get-route', + 'returns': ['GuestNetworkRouteStat'] +} --2.40.1
Quoted 11 lines · Dehan Meng
v3 -> v4
- Fix some indentation issues
- Update 'Since 8.2' to 'Since 9.1'
- Remove useless enum and adjust this change.v2 -> v3
- Remove this declaration and make the function 'hexToIPAddress' as static.
- Define 'IFNAMSIZ' from kernel instead of a hardcode
- Remove 'GUEST_NETWORK_ROUTE_TYPE_LINUX'
- Set flags 'has_xxx' for checking if a field exists or has a value set
Quoted 7 lines
v1 -> v2
- Replacesnprintf()tog_strdup_printf()to avoid memory problems.
- Remove the parameter 'char ipAddress[16]' in function 'char*hexToIPAddress()'.
- Add a piece of logic to skip traversing the first line of the file
Looks like the old version was sent. There are no changes in v1 -> v2 and v2 -> v3 in this patch.
Quoted 12 lines
Dehan Meng (1):
qga/linux: Add new api 'guest-network-get-route'qga/commands-posix.c | 73 ++++++++++++++++++++++++++++++++++++++++++++ qga/commands-win32.c | 6 ++++ qga/qapi-schema.json | 68 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+)--
2.40.1