Skip to content
This repository was archived by the owner on Jan 16, 2024. It is now read-only.

Commit 836379c

Browse files
author
Deyan Chepishev
committed
fixed get_network to calculate correctly the network address
Signed-off-by: Deyan Chepishev <dchepishev@superhosting.bg>
1 parent 5e89a5c commit 836379c

File tree

5 files changed

+15
-5
lines changed

5 files changed

+15
-5
lines changed

src/etc/one-context.d/loc-10-network##apk.one

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ get_network() {
4141
network=$(get_iface_var "NETWORK")
4242

4343
if [ -z "$network" ]; then
44-
network="$(echo $IP | cut -d'.' -f1,2,3).0"
44+
IFS=. read -r i1 i2 i3 i4 <<< "$IP"
45+
IFS=. read -r m1 m2 m3 m4 <<< "$(get_mask)"
46+
network=$(printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))")
4547
fi
4648

4749
echo $network

src/etc/one-context.d/loc-10-network##arch.one

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ get_network() {
5656
network=$(get_iface_var "NETWORK")
5757

5858
if [ -z "$network" ]; then
59-
network="$(echo $IP | cut -d'.' -f1,2,3).0"
59+
IFS=. read -r i1 i2 i3 i4 <<< "$IP"
60+
IFS=. read -r m1 m2 m3 m4 <<< "$(get_mask)"
61+
network=$(printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))")
6062
fi
6163

6264
echo $network

src/etc/one-context.d/loc-10-network##bsd.one

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ get_network() {
3737
network=$(get_iface_var "NETWORK")
3838

3939
if [ -z "$network" ]; then
40-
network="$(echo $IP | cut -d'.' -f1,2,3).0"
40+
IFS=. read -r i1 i2 i3 i4 <<< "$IP"
41+
IFS=. read -r m1 m2 m3 m4 <<< "$(get_mask)"
42+
network=$(printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))")
4143
fi
4244

4345
echo $network

src/etc/one-context.d/loc-10-network##deb.one

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ get_network() {
3737
network=$(get_iface_var "NETWORK")
3838

3939
if [ -z "$network" ]; then
40-
network="$(echo $IP | cut -d'.' -f1,2,3).0"
40+
IFS=. read -r i1 i2 i3 i4 <<< "$IP"
41+
IFS=. read -r m1 m2 m3 m4 <<< "$(get_mask)"
42+
network=$(printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))")
4143
fi
4244

4345
echo $network

src/etc/one-context.d/loc-10-network##rpm.one

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ get_network() {
3737
network=$(get_iface_var "NETWORK")
3838

3939
if [ -z "$network" ]; then
40-
network="$(echo $IP | cut -d'.' -f1,2,3).0"
40+
IFS=. read -r i1 i2 i3 i4 <<< "$IP"
41+
IFS=. read -r m1 m2 m3 m4 <<< "$(get_mask)"
42+
network=$(printf "%d.%d.%d.%d\n" "$((i1 & m1))" "$((i2 & m2))" "$((i3 & m3))" "$((i4 & m4))")
4143
fi
4244

4345
echo $network

0 commit comments

Comments
 (0)