Skip to content

Commit

Permalink
update examples
Browse files Browse the repository at this point in the history
  • Loading branch information
0pcom committed Jul 2, 2024
1 parent 1b40ba1 commit 8ed7718
Show file tree
Hide file tree
Showing 2 changed files with 156 additions and 170 deletions.
16 changes: 4 additions & 12 deletions examples/tcp-proxy-dmsg/tcp-proxy-dmsg.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,17 @@ import (
"os"
"sync"

cc "github.com/ivanpirog/coloredcobra"
"github.com/skycoin/skywire-utilities/pkg/cipher"
"github.com/skycoin/skywire-utilities/pkg/cmdutil"
"github.com/skycoin/skywire-utilities/pkg/logging"
"github.com/skycoin/skywire-utilities/pkg/skyenv"
cc "github.com/ivanpirog/coloredcobra"
"github.com/spf13/cobra"

"github.com/skycoin/dmsg/pkg/disc"
dmsg "github.com/skycoin/dmsg/pkg/dmsg"

)



func main() {
cc.Init(&cc.Config{
RootCmd: srvCmd,
Expand All @@ -49,8 +46,6 @@ const help = "Usage:\r\n" +
"Global Flags:\r\n" +
"{{.InheritedFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}\r\n\r\n"



var (
httpC http.Client
dmsgC *dmsg.Client
Expand Down Expand Up @@ -78,10 +73,9 @@ var (
localPort uint
err error
rawTCP []bool
RootCmd = srvCmd
RootCmd = srvCmd
)


func init() {
srvCmd.Flags().UintVarP(&localPort, "lport", "l", 8086, "local application http interface port(s)")
srvCmd.Flags().UintVarP(&dmsgPort, "dport", "d", 8086, "dmsg port(s) to serve")
Expand All @@ -96,10 +90,11 @@ func init() {
srvCmd.SetHelpCommand(&cobra.Command{Hidden: true})
srvCmd.PersistentFlags().MarkHidden("help") //nolint
}

var srvCmd = &cobra.Command{
Use: "srv",
Short: "serve raw TCP from local port over dmsg",
Long: `DMSG web server - serve http or raw TCP interface from local port over dmsg`,
Long: `DMSG web server - serve http or raw TCP interface from local port over dmsg`,
Run: func(_ *cobra.Command, _ []string) {
server()
},
Expand All @@ -117,7 +112,6 @@ func server() {
}
log.Infof("dmsg client pk: %v", pk.String())


dmsgC := dmsg.NewClient(pk, sk, disc.NewHTTP(dmsgDisc, &http.Client{}, log), dmsg.DefaultConfig())
defer func() {
if err := dmsgC.Close(); err != nil {
Expand All @@ -140,7 +134,6 @@ func server() {
log.Fatalf("Error listening on port %d: %v", dmsgPort, err)
}


go func(l net.Listener, port uint) {
<-ctx.Done()
if err := l.Close(); err != nil {
Expand All @@ -149,7 +142,6 @@ func server() {
}
}(lis, dmsgPort)


wg := new(sync.WaitGroup)

wg.Add(1)
Expand Down
Loading

0 comments on commit 8ed7718

Please sign in to comment.