util: Remove @masked argument from virSocketAddrFormatWithPrefix

Ever since its introduction in commit 426afc00 all the callers
pass true.

Remove the argument.

Signed-off-by: Julio Faracco <jcfaracco@gmail.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/network/network_iptables.c b/src/network/network_iptables.c
index d21ce59b702d3bcc726859d546499cc9bb0b5b2f..6002d120b0b9767514b189585d063cf9f5257ed8 100644 (file)
--- a/src/network/network_iptables.c
+++ b/src/network/network_iptables.c
@@ -384,7 +384,7 @@ iptablesForwardAllowOut(virFirewall *fw,
     virFirewallLayer layer = VIR_SOCKET_ADDR_FAMILY(netaddr) == AF_INET ?
         VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6;
 
-    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix, true)))
+    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix)))
         return -1;
 
     if (physdev && physdev[0])
@@ -474,7 +474,7 @@ iptablesForwardAllowRelatedIn(virFirewall *fw,
         VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6;
     g_autofree char *networkstr = NULL;
 
-    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix, true)))
+    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix)))
         return -1;
 
     if (physdev && physdev[0])
@@ -566,7 +566,7 @@ iptablesForwardAllowIn(virFirewall *fw,
         VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6;
     g_autofree char *networkstr = NULL;
 
-    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix, true)))
+    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix)))
         return -1;
 
     if (physdev && physdev[0])
@@ -820,7 +820,7 @@ iptablesForwardMasquerade(virFirewall *fw,
     virFirewallLayer layer = af == AF_INET ?
         VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6;
 
-    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix, true)))
+    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix)))
         return -1;
 
     if (VIR_SOCKET_ADDR_IS_FAMILY(&addr->start, af)) {
@@ -965,7 +965,7 @@ iptablesForwardDontMasquerade(virFirewall *fw,
     virFirewallLayer layer = VIR_SOCKET_ADDR_FAMILY(netaddr) == AF_INET ?
         VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6;
 
-    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix, true)))
+    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix)))
         return -1;
 
     if (physdev && physdev[0])

diff --git a/src/network/network_nftables.c b/src/network/network_nftables.c
index 5d716264bf5f5cd6661994eb1fd289895d09661e..cffe8072f59ca67c20df7a91df6388d78dac519a 100644 (file)
--- a/src/network/network_nftables.c
+++ b/src/network/network_nftables.c
@@ -354,7 +354,7 @@ nftablesAddForwardAllowOut(virFirewall *fw,
     const char *layerStr = nftablesLayerTypeToString(layer);
     virFirewallCmd *fwCmd;
 
-    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix, true)))
+    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix)))
         return -1;
 
     fwCmd = virFirewallAddCmd(fw, layer, "insert", "rule",
@@ -392,7 +392,7 @@ nftablesAddForwardAllowRelatedIn(virFirewall *fw,
     g_autofree char *networkstr = NULL;
     virFirewallCmd *fwCmd;
 
-    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix, true)))
+    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix)))
         return -1;
 
     fwCmd = virFirewallAddCmd(fw, layer, "insert", "rule",
@@ -430,7 +430,7 @@ nftablesAddForwardAllowIn(virFirewall *fw,
     g_autofree char *networkstr = NULL;
     virFirewallCmd *fwCmd;
 
-    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix, true)))
+    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix)))
         return -1;
 
     fwCmd = virFirewallAddCmd(fw, layer, "insert", "rule",
@@ -544,7 +544,7 @@ nftablesAddForwardMasquerade(virFirewall *fw,
         VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6;
     const char *layerStr =  nftablesLayerTypeToString(layer);
 
-    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix, true)))
+    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix)))
         return -1;
 
     if (VIR_SOCKET_ADDR_IS_FAMILY(&addr->start, af)) {
@@ -628,7 +628,7 @@ nftablesAddDontMasquerade(virFirewall *fw,
     const char *layerStr =  nftablesLayerTypeToString(layer);
     virFirewallCmd *fwCmd;
 
-    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix, true)))
+    if (!(networkstr = virSocketAddrFormatWithPrefix(netaddr, prefix)))
         return -1;
 
     fwCmd = virFirewallAddCmd(fw, layer, "insert", "rule",

diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
index 4d4a6b2a0f52a2756e6b9f01c9776bfb78a85f87..1f203fb50d704876af3f87134e7d765aa6a7e65b 100644 (file)
--- a/src/util/virsocketaddr.c
+++ b/src/util/virsocketaddr.c
@@ -529,17 +529,15 @@ virSocketAddrFormatFull(const virSocketAddr *addr,
  * @masked: true to mask off the host bits of the address
  *
  * Returns a string representation of the IP network described by
- * @netaddr/@prefix. If @masked is true, the address is masked to
- * remove the host bits according to prefix. So, for example, sending
- * f(1.2.3.4, 24, true) would return "1.2.3.0/24", but f(1.2.3.4, 24,
- * false) would return "1.2.3.4/24".
+ * @addr/@prefix. The address is masked to remove the host bits
+ * according to prefix. So, for example, sending
+ * f(1.2.3.4, 24) would return "1.2.3.0/24".
  *
- * returns false on failure (and logs an error message)
+ * Returns NULL on failure (and logs an error message)
  */
 char *
 virSocketAddrFormatWithPrefix(virSocketAddr *addr,
-                              unsigned int prefix,
-                              bool masked)
+                              unsigned int prefix)
 {
     virSocketAddr network;
     g_autofree char *netstr = NULL;
@@ -551,7 +549,7 @@ virSocketAddrFormatWithPrefix(virSocketAddr *addr,
         return NULL;
     }
 
-    if (masked && virSocketAddrMaskByPrefix(addr, prefix, &network) < 0) {
+    if (virSocketAddrMaskByPrefix(addr, prefix, &network) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Failure to mask address"));
         return NULL;

diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h
index 47b8effa85e7280c475c036a1874d858cf61f5cd..c7ad3250e0103e96a9536ccacc6d2b5279dda0cc 100644 (file)
--- a/src/util/virsocketaddr.h
+++ b/src/util/virsocketaddr.h
@@ -89,8 +89,7 @@ char *virSocketAddrFormatFull(const virSocketAddr *addr,
                               bool withService,
                               const char *separator);
 char *virSocketAddrFormatWithPrefix(virSocketAddr *addr,
-                                    unsigned int prefix,
-                                    bool masked);
+                                    unsigned int prefix);
 
 char *virSocketAddrGetPath(virSocketAddr *addr);