Skip to content

Add IPv6 support #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adrelanos merged 6 commits into from
Sep 13, 2025
+154 −39
Merged

Add IPv6 support #10

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e7de2a0
Add IPv6 support
DanWin Oct 11, 2024
4e202b1
Add qubes IPs
DanWin Oct 28, 2024
aa02720
Switch 127.0.0.0/24 to 127.0.0.0/8
DanWin Dec 8, 2024
2d7f21f
Add Non-Qubes-Whonix-Gateway IP to qubes destinations
DanWin Dec 8, 2024
1183916
Add missing network to LOCAL_NET_IP6
DanWin Dec 8, 2024
b74c956
Fix systemcheck_user rule
DanWin Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions usr/bin/whonix-gateway-firewall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,8 @@ variables_defaults() {
if test -f /usr/share/qubes/marker-vm; then
LOCAL_NET_IP6="\
::1/128 \
fd09:24ef:4179::a8a:/112 \
fd09:24ef:4179::a89:/112 \
Comment thread
DanWin marked this conversation as resolved.
::ffff:127.0.0.0/120 \
::ffff:10.137.0.0/112 \
::ffff:10.138.0.0/112 \
Expand Down Expand Up @@ -212,13 +214,15 @@ variables_defaults() {
if [ -z "${WORKSTATION_DEST_SOCKSIFIED_IPV6:-}" ]; then
## 10.152.152.10 - Non-Qubes-Whonix-Gateway IP
##
## 10.137.0.0/8 - persistent Qubes-Whonix-Gateway IP range
## 10.138.0.0/8 - DispVM Qubes-Whonix-Gateway IP range
## fd09:24ef:4179::a89/112 - persistent Qubes-Whonix-Gateway IP range
## fd09:24ef:4179::a8a/112 - DispVM Qubes-Whonix-Gateway IP range
Comment on lines +217 to +218

@ArrayBolt3 ArrayBolt3 Mar 28, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
## fd09:24ef:4179::a89/112 - persistent Qubes-Whonix-Gateway IP range
## fd09:24ef:4179::a8a/112 - DispVM Qubes-Whonix-Gateway IP range
## fd09:24ef:4179::a89:/112 - persistent Qubes-Whonix-Gateway IP range
## fd09:24ef:4179::a8a:/112 - DispVM Qubes-Whonix-Gateway IP range

@ArrayBolt3 ArrayBolt3 Sep 14, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixing post-merge.

if test -f /usr/share/qubes/marker-vm; then
## https://forums.whonix.org/t/whonix-gateway-not-reachable/7484/16
## Qubes-Whonix:
## IP HARDCODED. IP 10.152.152.10 is hardcoded in some places.
WORKSTATION_DEST_SOCKSIFIED_IPV6="\
Comment thread
DanWin marked this conversation as resolved.
fd09:24ef:4179::a8a:/112 \
fd09:24ef:4179::a89:/112 \
::ffff:10.137.0.0/112 \
::ffff:10.139.0.0/112 \
::ffff:10.152.152.10 \
Expand Down
4 changes: 3 additions & 1 deletion usr/bin/whonix-workstation-firewall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ variables_defaults() {
## Would fail if netvm is set to 'none',
## which is the case in Qubes R4 TemplateVMs.
[ -n "${GATEWAY_IP:-}" ] || GATEWAY_IP="$(qubesdb-read /qubes-gateway 2> /dev/null)" || GATEWAY_IP="127.0.0.1"
[ -n "${GATEWAY_IP6:-}" ] || GATEWAY_IP6="::ffff:$(qubesdb-read /qubes-gateway 2> /dev/null)" || GATEWAY_IP6="::1"
[ -n "${GATEWAY_IP6:-}" ] || GATEWAY_IP6="::ffff:$(qubesdb-read /qubes-gateway6 2> /dev/null)" || GATEWAY_IP6="::1"

@ArrayBolt3 ArrayBolt3 Mar 28, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe I misunderstood something, but I was under the impression that the /qubes-gateway6 qubesdb entry contained an IPv6 address. This looks like it's being used as an IPv4 address though.

@ArrayBolt3 ArrayBolt3 Sep 14, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on https://github.com/QubesOS/qubes-doc/blob/d9a6e20f3a1ad3ca5215059267df099bfecc6728/user/advanced-topics/standalones-and-hvms.rst?plain=1#L258 it does look like /qubes-gateway6 is a real IPv6 address. Adjusting accordingly.

else
## IP HARDCODED. If you want to change IP, set variable GATEWAY_IP through a
## drop-in configuration snippet in /etc/whonix_firewall.d
Expand Down Expand Up @@ -87,6 +87,8 @@ variables_defaults() {
if test -f /usr/share/qubes/marker-vm; then
LOCAL_NET_IP6="\
::1/128 \
fd09:24ef:4179::a8a:/112 \
fd09:24ef:4179::a89:/112 \
::ffff:127.0.0.0/120 \
::ffff:10.137.0.0/112 \
::ffff:10.138.0.0/112 \
Expand Down