Skip to content

Commit

Permalink
fix linux client proxy build
Browse files Browse the repository at this point in the history
  • Loading branch information
parvit committed Sep 10, 2024
1 parent 461aa44 commit 6812f2a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,17 @@ jobs:
cd backend/
go generate
- name: Build Executable
- name: Build QPep
run: |
go build -v -o build/qpep
- name: Build QPep Tray
run: |
pushd qpep-tray
set CGO_ENABLED=0
go build -o ../build/qpep-tray
popd
- uses: actions/upload-artifact@v4
with:
name: qpep_linux_b${{ github.run_id }}
Expand Down
2 changes: 0 additions & 2 deletions docs/user-manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -353,8 +353,6 @@ Usage

### Client

> The following instructions apply to Windows OS installation
After installing successfully, use the desktop icon to launch the QPep tray application.

![Tray Launch Icon](resources/5.png){ width=100pt }
Expand Down
8 changes: 4 additions & 4 deletions workers/client/client_proxy_listener_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package client

import (
"errors"
stderr "errors"
"fmt"
"github.com/parvit/qpep/shared/errors"
"net"
Expand Down Expand Up @@ -90,13 +90,13 @@ const (

func getOriginalDst(clientConn *net.TCPConn) (*net.TCPAddr, *net.TCPConn, error) {
if clientConn == nil {
return nil, nil, errors.New("ERR: clientConn is nil")
return nil, nil, stderr.New("ERR: clientConn is nil")
}

// test if the underlying fd is nil
remoteAddr := clientConn.RemoteAddr()
if remoteAddr == nil {
return nil, nil, errors.New("ERR: clientConn.fd is nil")
return nil, nil, stderr.New("ERR: clientConn.fd is nil")
}

fmt.Printf(">> %v\n", clientConn.RemoteAddr())
Expand Down Expand Up @@ -128,7 +128,7 @@ func getOriginalDst(clientConn *net.TCPConn) (*net.TCPAddr, *net.TCPConn, error)
clientConnFile.Close()
} else {
errmsg := fmt.Sprintf("ERR: newConn is not a *net.TCPConn, instead it is: %T (%v)", newConn, newConn)
return nil, nil, errors.New(errmsg)
return nil, nil, stderr.New(errmsg)
}

// attention: IPv4 only!!!
Expand Down

0 comments on commit 6812f2a

Please sign in to comment.