net: define IPv4 object explicitly

Modify all IPv4 variables, function arguments name and daemon arguments
to IPv4 specific naming to raise consistency with IPv6. This change is
done in order to make source code more legible before addressing #8818.

* --p2p-bind-ip is replaced with --p2p-bind-ipv4-address
* --p2p-bind-port is replaced with --p2p-bind-port-ipv4
* --rpc-bind-ip is replaced with --rpc-bind-ipv4-address
* --rpc-restricted-bind-ip is replaced with --rpc-restricted-bind-ipv4-address

Bug: https://github.com/monero-project/monero/issues/8818

2 files changed, 8 insertions, 8 deletions

diff --git a/utils/fish/monero-wallet-rpc.fish b/utils/fish/monero-wallet-rpc.fish
index d89f58b49..c06f01b03 100644
--- a/utils/fish/monero-wallet-rpc.fish
+++ b/utils/fish/monero-wallet-rpc.fish
@@ -34,14 +34,14 @@ complete -c monero-wallet-cli -l allow-mismatched-daemon-version -d "Allow commu
 complete -c monero-wallet-rpc -l rpc-bind-port -r -d "Sets bind port for server"
 complete -c monero-wallet-rpc -l disable-rpc-login -d "Disable HTTP authentication for RPC connections served by this process"
 complete -c monero-wallet-rpc -l restricted-rpc -d "Restricts to view-only commands"
-complete -c monero-wallet-rpc -l rpc-bind-ip -r -d "Specify IP to bind RPC server. Default: 127.0.0.1"
+complete -c monero-wallet-rpc -l rpc-bind-ipv4-address -r -d "Specify IPv4 address to bind RPC server. Default: 127.0.0.1"
 complete -c monero-wallet-rpc -l rpc-bind-ipv6-address -r -d "Specify IPv6 address to bind RPC server. Default: ::1"
-complete -c monero-wallet-rpc -l rpc-restricted-bind-ip -r -d "Specify IP to bind restricted RPC server. Default: 127.0.0.1"
+complete -c monero-wallet-rpc -l rpc-restricted-bind-ipv4-address -r -d "Specify IPv4 address to bind restricted RPC server. Default: 127.0.0.1"
 complete -c monero-wallet-rpc -l rpc-restricted-bind-ipv6-address -r -d "Specify IPv6 address to bind restricted RPC server. Default: ::1"
 complete -c monero-wallet-rpc -l rpc-use-ipv6 -d "Allow IPv6 for RPC"
 complete -c monero-wallet-rpc -l rpc-ignore-ipv4 -d "Ignore unsuccessful IPv4 bind for RPC"
 complete -c monero-wallet-rpc -l rpc-login -r -d "Specify username[:password] required for RPC server"
-complete -c monero-wallet-rpc -l confirm-external-bind -d "Confirm rpc-bind-ip value is NOT a loopback (local) IP"
+complete -c monero-wallet-rpc -l confirm-external-bind -d "Confirm rpc-bind-ipv4-address value is NOT a loopback (local) IP"
 complete -c monero-wallet-rpc -l rpc-access-control-origins -r -d "Specify a comma separated list of origins to allow cross origin resource sharing"
 complete -c monero-wallet-rpc -l rpc-ssl -x -a "enabled disabled autodetect" -d "Enable SSL on RPC connections. Default: autodetect"
 complete -c monero-wallet-rpc -l rpc-ssl-private-key -r -k -a "(__fish_complete_suffix .pem)" -d "Path to a PEM format private key"
diff --git a/utils/fish/monerod.fish b/utils/fish/monerod.fish
index 29be7c3ec..e1b3551ee 100644
--- a/utils/fish/monerod.fish
+++ b/utils/fish/monerod.fish
@@ -54,9 +54,9 @@ complete -c monerod -l bg-mining-idle-threshold -r -d "Specify minimum avg idle
 complete -c monerod -l bg-mining-miner-target -r -d "Specify maximum percentage cpu use by miner(s)"
 complete -c monerod -l db-sync-mode -r -d "Specify sync option, using format [safe|fast|fastest]:[sync|async]:[<nblo cks_per_sync>[blocks]|<nbytes_per_sync> [bytes]]. Default: fast:async:250000000bytes"
 complete -c monerod -l db-salvage -d "Try to salvage a blockchain database if it seems corrupted"
-complete -c monerod -l p2p-bind-ip -r -d "Interface for p2p network protocol (IPv4). Default: 0.0.0.0"
+complete -c monerod -l p2p-bind-ipv4-address -r -d "Interface for p2p network protocol (IPv4). Default: 0.0.0.0"
 complete -c monerod -l p2p-bind-ipv6-address -r -d "Interface for p2p network protocol (IPv6). Default: ::"
-complete -c monerod -l p2p-bind-port -r -d "Port for p2p network protocol (IPv4). Default: 18080, 28080 if 'testnet', 38080 if 'stagenet'"
+complete -c monerod -l p2p-bind-port-ipv4 -r -d "Port for p2p network protocol (IPv4). Default: 18080, 28080 if 'testnet', 38080 if 'stagenet'"
 complete -c monerod -l p2p-bind-port-ipv6 -d "Port for p2p network protocol (IPv6). Default: 18080, 28080 if 'testnet', 38080 if 'stagenet'"
 complete -c monerod -l p2p-use-ipv6 -d "Enable IPv6 for p2p"
 complete -c monerod -l p2p-ignore-ipv4 -d "Ignore unsuccessful IPv4 bind for p2p"
@@ -88,14 +88,14 @@ complete -c monerod -l restricted-rpc -d "Restrict RPC to view only commands and
 complete -c monerod -l bootstrap-daemon-address -r -d "URL of a 'bootstrap' remote daemon that the connected wallets can use while this daemon is still not fully synced. Use 'auto' to enable automatic public nodes discovering and bootstrap daemon switching"
 complete -c monerod -l bootstrap-daemon-login -r -d "Specify username:password for the bootstrap daemon login"
 complete -c monerod -l bootstrap-daemon-proxy -r -d "<ip>:<port> socks proxy to use for bootstrap daemon connections"
-complete -c monerod -l rpc-bind-ip -r -d "Specify IP to bind RPC server. Default: 127.0.0.1"
+complete -c monerod -l rpc-bind-ipv4-address -r -d "Specify IPv4 address to bind RPC server. Default: 127.0.0.1"
 complete -c monerod -l rpc-bind-ipv6-address -r -d "Specify IPv6 address to bind RPC server. Default: ::1"
-complete -c monerod -l rpc-restricted-bind-ip -r -d "Specify IP to bind restricted RPC server. Default: 127.0.0.1"
+complete -c monerod -l rpc-restricted-bind-ipv4-address -r -d "Specify IPv4 address to bind restricted RPC server. Default: 127.0.0.1"
 complete -c monerod -l rpc-restricted-bind-ipv6-address -r -d "Specify IPv6 address to bind restricted RPC server. Default: ::1"
 complete -c monerod -l rpc-use-ipv6 -d "Allow IPv6 for RPC"
 complete -c monerod -l rpc-ignore-ipv4 -d "Ignore unsuccessful IPv4 bind for RPC"
 complete -c monerod -l rpc-login -d "Specify username[:password] required for RPC server"
-complete -c monerod -l confirm-external-bind -d "Confirm rpc-bind-ip value is NOT a loopback (local) IP"
+complete -c monerod -l confirm-external-bind -d "Confirm rpc-bind-ipv4-address value is NOT a loopback (local) IP"
 complete -c monerod -l rpc-access-control-origins -r -d "Specify a comma separated list of origins to allow cross origin resource sharing"
 complete -c monerod -l rpc-ssl -x -a "enabled disabled autodetect" -d "Enable SSL on RPC connections. Default: autodetect"
 complete -c monerod -l rpc-ssl-private-key -r -k -a "(__fish_complete_suffix .pem)" -d "Path to a PEM format private key"