Minor fixes for alpha2

RoganDawes · Dec 6, 2018 · 74a373f · 74a373f
1 parent a585a39
commit 74a373f
Show file tree

Hide file tree

Showing 46 changed files with 83 additions and 209 deletions.
diff --git a/Makefile b/Makefile
@@ -46,13 +46,13 @@ dep:
 	#go get -u github.com/gorilla/websocket
 
 compile:
-	go get -u github.com/mame82/P4wnP1_go/... # partially downloads again, but we need the library packages in go path to build
+	go get -u github.com/mame82/P4wnP1_aloa/... # partially downloads again, but we need the library packages in go path to build
 	# <--- second compilation, maybe -d flag on go get above is better
 	env GOBIN=$(CURDIR)/build go install ./cmd/... # compile all main packages to the build folder
 
 	# compile the web app
 	# ToDo: (check if dependencies have been fetched by 'go get', even with the build js tags)
-	$(HOME)/go/bin/gopherjs get github.com/mame82/P4wnP1_go/web_client/...
+	$(HOME)/go/bin/gopherjs get github.com/mame82/P4wnP1_aloa/web_client/...
 	$(HOME)/go/bin/gopherjs build -m -o build/webapp.js web_client/*.go
 
 installkali:

diff --git a/cli_client/cmd_hid.go b/cli_client/cmd_hid.go
@@ -2,7 +2,7 @@ package cli_client
 
 import (
 	"context"
-	"github.com/mame82/P4wnP1_go/common"
+	"github.com/mame82/P4wnP1_aloa/common"
 	"github.com/spf13/cobra"
 	"fmt"
 	"path/filepath"
@@ -13,7 +13,7 @@ import (
 	"errors"
 	"log"
 	"strconv"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 )
 
 var (

diff --git a/cli_client/cmd_led.go b/cli_client/cmd_led.go
@@ -4,7 +4,7 @@ import (
 	"github.com/spf13/cobra"
 	"os"
 
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 	"fmt"
 	"log"
 )

diff --git a/cli_client/cmd_net.go b/cli_client/cmd_net.go
@@ -2,15 +2,15 @@ package cli_client
 
 import (
 	"github.com/spf13/cobra"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 	"net"
 	"errors"
 	"fmt"
 	"google.golang.org/grpc/status"
-	//"github.com/mame82/P4wnP1_go/service"
+	//"github.com/mame82/P4wnP1_aloa/service"
 	"strings"
 	"strconv"
-	"github.com/mame82/P4wnP1_go/common_web"
+	"github.com/mame82/P4wnP1_aloa/common_web"
 )
 
 //Empty settings used to store cobra flags

diff --git a/cli_client/cmd_root.go b/cli_client/cmd_root.go
@@ -2,7 +2,7 @@ package cli_client
 
 import (
 	"fmt"
-	"github.com/mame82/P4wnP1_go/common_web"
+	"github.com/mame82/P4wnP1_aloa/common_web"
 	"os"
 
 	"github.com/spf13/cobra"

diff --git a/cli_client/cmd_template.go b/cli_client/cmd_template.go
@@ -2,7 +2,7 @@ package cli_client
 
 import (
 	"fmt"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"os"

diff --git a/cli_client/cmd_usb_new.go b/cli_client/cmd_usb_new.go
@@ -3,7 +3,7 @@ package cli_client
 import (
 	"encoding/json"
 	"fmt"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 	"github.com/spf13/cobra"
 	"log"
 	"os"

diff --git a/cli_client/cmd_wifi.go b/cli_client/cmd_wifi.go
@@ -2,7 +2,7 @@ package cli_client
 
 import (
 	"github.com/spf13/cobra"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 	"fmt"
 	"google.golang.org/grpc/status"
 	"os"

diff --git a/cli_client/rpc_client.go b/cli_client/rpc_client.go
@@ -2,7 +2,7 @@ package cli_client
 
 import (
 	"fmt"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 	"errors"
 	"context"
 	"google.golang.org/grpc"

diff --git a/cmd/P4wnP1_cli/P4wnP1_cli.go b/cmd/P4wnP1_cli/P4wnP1_cli.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/mame82/P4wnP1_go/cli_client"
+	"github.com/mame82/P4wnP1_aloa/cli_client"
 )
 
 func main() {

diff --git a/cmd/P4wnP1_service/P4wnP1_service.go b/cmd/P4wnP1_service/P4wnP1_service.go
@@ -4,8 +4,8 @@ package main
 
 import (
 	"fmt"
-	"github.com/mame82/P4wnP1_go/common_web"
-	"github.com/mame82/P4wnP1_go/service"
+	"github.com/mame82/P4wnP1_aloa/common_web"
+	"github.com/mame82/P4wnP1_aloa/service"
 	"log"
 	"os"
 	"os/signal"

diff --git a/cmd/testhid/testhid.go b/cmd/testhid/testhid.go
@@ -3,7 +3,7 @@
 package main
 
 import(
-	"github.com/mame82/P4wnP1_go/hid"
+	"github.com/mame82/P4wnP1_aloa/hid"
 
 	"log"
 	"fmt"

diff --git a/common_web/Globals.go b/common_web/Globals.go
@@ -4,6 +4,6 @@ const (
 	MAJOR = 0
 	MINOR = 1
 	PATCH = 0
-	SUFFIX = "-alpha1"
+	SUFFIX = "-alpha2"
 	VERSION = "v0.1.0"+SUFFIX
 )
diff --git a/dist/db/init.db b/dist/db/init.db
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/mame82/P4wnP1_go
+module github.com/mame82/P4wnP1_aloa
 
 require (
 	github.com/AndreasBriese/bbloom v0.0.0-20180913140656-343706a395b7 // indirect

diff --git a/mgenetlink/client.go b/mgenetlink/client.go
@@ -1,7 +1,7 @@
 package mgenetlink
 
 import (
-	nl "github.com/mame82/P4wnP1_go/mnetlink"
+	nl "github.com/mame82/P4wnP1_aloa/mnetlink"
 	"errors"
 	"golang.org/x/sys/unix"
 	"log"

diff --git a/mgenetlink/common.go b/mgenetlink/common.go
@@ -1,5 +1,5 @@
 package mgenetlink
 
-import "github.com/mame82/P4wnP1_go/mnetlink"
+import "github.com/mame82/P4wnP1_aloa/mnetlink"
 
 var hbo = mnetlink.Hbo()
diff --git a/mgenetlink/family.go b/mgenetlink/family.go
@@ -3,7 +3,7 @@ package mgenetlink
 import (
 	"errors"
 	"fmt"
-	"github.com/mame82/P4wnP1_go/mnetlink"
+	"github.com/mame82/P4wnP1_aloa/mnetlink"
 	"golang.org/x/sys/unix"
 )
 

diff --git a/mgenetlink/mcast_group.go b/mgenetlink/mcast_group.go
@@ -2,7 +2,7 @@ package mgenetlink
 
 import (
 	"fmt"
-	"github.com/mame82/P4wnP1_go/mnetlink"
+	"github.com/mame82/P4wnP1_aloa/mnetlink"
 	"errors"
 	"golang.org/x/sys/unix"
 )

diff --git a/mgenetlink/message.go b/mgenetlink/message.go
@@ -1,7 +1,7 @@
 package mgenetlink
 
 import (
-	"github.com/mame82/P4wnP1_go/mnetlink"
+	"github.com/mame82/P4wnP1_aloa/mnetlink"
 	"golang.org/x/sys/unix"
 	"errors"
 )

diff --git a/mgenetlink/ops.go b/mgenetlink/ops.go
@@ -2,7 +2,7 @@ package mgenetlink
 
 import (
 	"fmt"
-	"github.com/mame82/P4wnP1_go/mnetlink"
+	"github.com/mame82/P4wnP1_aloa/mnetlink"
 	"golang.org/x/sys/unix"
 )
 

diff --git a/service/Event.go b/service/Event.go
@@ -3,9 +3,9 @@ package service
 import (
 	"context"
 	"fmt"
-	"github.com/mame82/P4wnP1_go/common_web"
-	"github.com/mame82/P4wnP1_go/hid"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	"github.com/mame82/P4wnP1_aloa/common_web"
+	"github.com/mame82/P4wnP1_aloa/hid"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 	"log"
 	"sync"
 	"time"

diff --git a/service/SubSysGpio.go b/service/SubSysGpio.go
@@ -5,7 +5,7 @@ package service
 import (
 	"context"
 	"fmt"
-	"github.com/mame82/P4wnP1_go/service/pgpio"
+	"github.com/mame82/P4wnP1_aloa/service/pgpio"
 	"periph.io/x/periph"
 	"periph.io/x/periph/conn/gpio"
 	"periph.io/x/periph/conn/gpio/gpioreg"
@@ -15,7 +15,7 @@ import (
 	"sync"
 	"time"
 	"errors"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 )
 
 var (

diff --git a/service/SubSysLED.go b/service/SubSysLED.go
@@ -1,7 +1,7 @@
 package service
 
 import (
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 	"io/ioutil"
 	"log"
 	"os"

diff --git a/service/SubSysNetworkManager.go b/service/SubSysNetworkManager.go
@@ -4,9 +4,9 @@ import (
 	"errors"
 	"fmt"
 	//"github.com/docker/libcontainer/netlink"
-	"github.com/mame82/P4wnP1_go/netlink"
-	pb "github.com/mame82/P4wnP1_go/proto"
-	"github.com/mame82/P4wnP1_go/service/util"
+	"github.com/mame82/P4wnP1_aloa/netlink"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
+	"github.com/mame82/P4wnP1_aloa/service/util"
 	"io/ioutil"
 	"log"
 	"net"

diff --git a/service/SubSysTriggerAction.go b/service/SubSysTriggerAction.go
@@ -6,10 +6,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/mame82/P4wnP1_go/common"
-	"github.com/mame82/P4wnP1_go/common_web"
-	pb "github.com/mame82/P4wnP1_go/proto"
-	"github.com/mame82/P4wnP1_go/service/util"
+	"github.com/mame82/P4wnP1_aloa/common"
+	"github.com/mame82/P4wnP1_aloa/common_web"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
+	"github.com/mame82/P4wnP1_aloa/service/util"
 	"io/ioutil"
 	"sync"
 )

diff --git a/service/SubSysUSB.go b/service/SubSysUSB.go
@@ -6,9 +6,9 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/mame82/P4wnP1_go/common"
-	"github.com/mame82/P4wnP1_go/hid"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	"github.com/mame82/P4wnP1_aloa/common"
+	"github.com/mame82/P4wnP1_aloa/hid"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 	"io/ioutil"
 	"log"
 	"net"

diff --git a/service/bluetooth.go b/service/bluetooth.go
@@ -5,10 +5,12 @@ package service
 import (
 	"errors"
 	"fmt"
-	pb "github.com/mame82/P4wnP1_go/proto"
-	"github.com/mame82/P4wnP1_go/service/bluetooth"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
+	"github.com/mame82/P4wnP1_aloa/service/bluetooth"
 	"github.com/mame82/mblue-toolz/toolz"
+	"io/ioutil"
 	"log"
+	"os"
 	"os/exec"
 	"regexp"
 	"strconv"
@@ -493,6 +495,10 @@ func (bt *BtService) EnableBridge() (err error) {
 	log.Println("... reconfigure ethernet settings for interface", bt.BrName)
 	if mi, err := bt.RootSvc.SubSysNetwork.GetManagedInterface(bt.BrName); err == nil {
 		mi.ReDeploy()
+		// disable IPv6 for bridge interface
+		//ioutil.WriteFile("/proc/sys/net/ipv6/conf/" + bt.BrName + "/disable_ipv6", []byte("1"), os.ModePerm)
+		// disable IPv6 for all interfaces
+		ioutil.WriteFile("/proc/sys/net/ipv6/conf/all/disable_ipv6", []byte("1"), os.ModePerm)
 	}
 
 

diff --git a/service/bluetooth/controller.go b/service/bluetooth/controller.go
@@ -9,12 +9,12 @@ import (
 	"sync"
 	"time"
 
-	//"github.com/mame82/P4wnP1_go/service"
+	//"github.com/mame82/P4wnP1_aloa/service"
 	"github.com/mame82/mblue-toolz/btmgmt"
 	"github.com/mame82/mblue-toolz/dbusHelper"
 	"github.com/mame82/mblue-toolz/toolz"
 	"errors"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 
 )
 

diff --git a/service/defaults.go b/service/defaults.go
@@ -1,7 +1,7 @@
 package service
 
 import (
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 )
 
 const (

diff --git a/service/dhcp.go b/service/dhcp.go
@@ -7,8 +7,8 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/mame82/P4wnP1_go/common_web"
-	pb "github.com/mame82/P4wnP1_go/proto"
+	"github.com/mame82/P4wnP1_aloa/common_web"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 	"io/ioutil"
 	"log"
 	"net"

diff --git a/service/dwc2_connect_watcher.go b/service/dwc2_connect_watcher.go
@@ -5,10 +5,10 @@ package service
 import (
 	"fmt"
 	"errors"
-	"github.com/mame82/P4wnP1_go/common_web"
+	"github.com/mame82/P4wnP1_aloa/common_web"
 
-	genl "github.com/mame82/P4wnP1_go/mgenetlink"
-	nl "github.com/mame82/P4wnP1_go/mnetlink"
+	genl "github.com/mame82/P4wnP1_aloa/mgenetlink"
+	nl "github.com/mame82/P4wnP1_aloa/mnetlink"
 )
 
 /*

diff --git a/service/led.go b/service/led.go
@@ -7,7 +7,7 @@ import(
 	"time"
 	"sync/atomic"
 
-	pb "github.com/mame82/P4wnP1_go/proto"
+	pb "github.com/mame82/P4wnP1_aloa/proto"
 )
 
 const (