Use ipconfig->address when reporting IP addresses for services
with FIXED method. AUTO method is used only by IPv6, don't report
any addresses should it erroneously appear for IPv4.
Fixes BMC#25084
connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
- append_addr = ipconfig->system;
-
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
+ case CONNMAN_IPCONFIG_METHOD_AUTO:
return;
case CONNMAN_IPCONFIG_METHOD_FIXED:
return;
case CONNMAN_IPCONFIG_METHOD_FIXED:
- if (append_addr == NULL)
- append_addr = ipconfig->address;
+ append_addr = ipconfig->address;
break;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
case CONNMAN_IPCONFIG_METHOD_DHCP:
break;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
case CONNMAN_IPCONFIG_METHOD_DHCP:
- case CONNMAN_IPCONFIG_METHOD_AUTO:
+ append_addr = ipconfig->system;
connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
connman_dbus_dict_append_basic(iter, "Method", DBUS_TYPE_STRING, &str);
- append_addr = ipconfig->system;
-
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
return;
case CONNMAN_IPCONFIG_METHOD_FIXED:
switch (ipconfig->method) {
case CONNMAN_IPCONFIG_METHOD_UNKNOWN:
case CONNMAN_IPCONFIG_METHOD_OFF:
return;
case CONNMAN_IPCONFIG_METHOD_FIXED:
- if (append_addr == NULL)
- append_addr = ipconfig->address;
+ append_addr = ipconfig->address;
break;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
case CONNMAN_IPCONFIG_METHOD_DHCP:
case CONNMAN_IPCONFIG_METHOD_AUTO:
break;
case CONNMAN_IPCONFIG_METHOD_MANUAL:
case CONNMAN_IPCONFIG_METHOD_DHCP:
case CONNMAN_IPCONFIG_METHOD_AUTO:
+ append_addr = ipconfig->system;