Skip to content
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.

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

1.1.4 #16

Merged
merged 26 commits into from
Sep 13, 2023
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
31e2e1b
working on private vpns
zveinn Aug 27, 2023
9c54ea3
custom dns done, just needs refactor
zveinn Aug 28, 2023
9f419dc
network NAT almost done, needs some tuning and refactoring
zveinn Aug 29, 2023
9c5803c
working on adding NAT and DNS to linux and macos
zveinn Aug 30, 2023
f6f9e0d
DNS and NAT applied to Linux and Macos
zveinn Aug 30, 2023
582eb8d
new portmapper + NAT. DNS still needs work on subdomains
zveinn Aug 30, 2023
bc4d34a
Port mapping for unix and macos
zveinn Aug 30, 2023
c05fc23
new tcp packet manipulation code is ready, big packet flow refactor t…
zveinn Sep 2, 2023
3286fca
new packet flow ready for windows
zveinn Sep 3, 2023
6a5bb20
adding missing files
zveinn Sep 3, 2023
3a427c8
packet flow for linux
zveinn Sep 3, 2023
8d17f43
DNS + NAT + NEW NETWORK FLOW == working
zveinn Sep 4, 2023
0039e0f
DNS blocking almost done
zveinn Sep 7, 2023
acdcb29
cleaning up minor stuff
zveinn Sep 8, 2023
d092617
adapting sendLocal and sendRemote to unix and macos
zveinn Sep 8, 2023
b55a90f
cleaning up packet readers
zveinn Sep 8, 2023
8b6644b
updated blocklists, dns blocking, packet processing, etc..
zveinn Sep 9, 2023
8f04efd
removing FileConfig struct
zveinn Sep 10, 2023
19bf963
adding experimental feature to kill open sockets on connect
zveinn Sep 10, 2023
f1d7c93
new stats bar, router and vpn list improved, advanced mode improvemen…
zveinn Sep 11, 2023
4f0ae8b
changes to blocklist import and private access point list
zveinn Sep 11, 2023
22258b2
adjusting screenloader layout
zveinn Sep 11, 2023
2cc1995
reworking the dashboard and router list
zveinn Sep 11, 2023
5e63e69
cleaning up logging and adjusting portmapping timeouts
zveinn Sep 11, 2023
0479ed5
minor fix for darwin
zveinn Sep 11, 2023
4f93f21
1.1.4 - build prospect
zveinn Sep 13, 2023
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
Prev Previous commit
Next Next commit
cleaning up packet readers
zveinn committed Sep 8, 2023
commit b55a90f9628e72f75e74b5ce656d5d4f8b4b41e6
2 changes: 1 addition & 1 deletion core/packet_unix.go
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ WAITFORDEVICE:
continue
}

if AS == nil || !GLOBAL_STATE.Connected {
if AS == nil || AS.AP == nil || !GLOBAL_STATE.Connected {
if time.Since(waitFortimeout).Seconds() > 120 {
CreateLog("", "ADAPTER: received packet while disconnected. This is most likely a probe packet")
waitFortimeout = time.Now()
12 changes: 6 additions & 6 deletions core/packet_windows.go
Original file line number Diff line number Diff line change
@@ -41,6 +41,9 @@ func ReadFromLocalTunnel_NEW(MONITOR chan int) {
nonce = make([]byte, chacha20poly1305.NonceSizeX)
writtenBytes int
writeError error

ingressAllocationBuffer []byte
ingressPacketLength int
)

WAITFORDEVICE:
@@ -104,22 +107,19 @@ WAITFORDEVICE:

EGRESS_PACKETS++

// log.Println(" BEFORE ==========================================")
// fmt.Println(packet)

sendRemote, sendLocal := ProcessEgressPacket(&packet)
if !sendLocal && !sendRemote {
log.Println("NOT SENDING EGRESS PACKET - PROTO:", packet[9])
continue
} else if sendLocal {

ingressPacketLength := len(packet)

// testPacket := gopacket.NewPacket(packet, layers.LayerTypeIPv4, gopacket.Default)
// log.Println(" DNS TEST ==========================================")
// fmt.Println(testPacket)
// log.Println(" ==========================================")
ingressAllocationBuffer, writeError := A.AllocateSendPacket(ingressPacketLength)

ingressPacketLength = len(packet)
ingressAllocationBuffer, writeError = A.AllocateSendPacket(ingressPacketLength)
if writeError != nil {
CreateErrorLog("", "Send: ", writeError)
return