fix: use the ip command
#84
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Now using `ip` (which is available since at least 2011).
BoboTiG
commented
Jul 27, 2024
BoboTiG
commented
Jul 27, 2024
bin/detect_ips.sh
Outdated
| (( ( ip & mask ) == ( gw & mask ) )) && | ||
| int2ip $ip myIp && int2ip $mask netMask | ||
| } | ||
| } | ||
| done < <(/sbin/ifconfig) | ||
| done < <(ip -4 -c=never -br addr) |
There was a problem hiding this comment.
Example of output from such a command:
lo UNKNOWN 127.0.0.1/8
enp4s0 UP 192.168.2.10/24
br-23a6b14a9fa6 DOWN 172.18.0.1/16
br-4abc919a1eb3 DOWN 172.20.0.1/16
docker0 UP 172.17.0.1/16
br-b804039dfb11 DOWN 172.19.0.1/16
BoboTiG
commented
Jul 27, 2024
bin/detect_ips.sh
Outdated
Comment on lines
53
to
55
| while IFS=$' :\t\r\n' read before netmask after; do | ||
| mask=$netmask | ||
| done < <(/usr/bin/ipcalc -n -b $rhs | grep Netmask) |
There was a problem hiding this comment.
This code will convert IP/24 to 255.255.255.0.
This comment was marked as outdated.
This comment was marked as outdated.
|
Awesome @BoboTiG! Thanks a lot. I'll put @herr-seppia as reviewer, as I can't test it properly this week. Looks very good though! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ifconfigNow using
ip(which is available since at least 2011).ipfor the route checkThe new code is more readable and contains less lines actually. But I needed to keep the macOS compatibility, so that's why the patch is more important.
If the macOs support can be dropped, then I could simplify more, LMK.