add address to args (#30)

elcritch · Oct 27, 2024 · f1231af · f1231af
1 parent 924772f
commit f1231af
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/nesper.nimble b/nesper.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.7.6"
+version       = "0.7.7"
 author        = "Jaremy Creechley"
 description   = "Nim wrappers for ESP-IDF (ESP32)"
 license       = "Apache-2.0"

diff --git a/src/nesper/servers/rpc/rpcsocket_json.nim b/src/nesper/servers/rpc/rpcsocket_json.nim
@@ -39,11 +39,12 @@ proc rpcMsgPackReadHandler*(srv: TcpServerInfo[RpcRouter], result: ReadyKey, sou
     echo("control server: error: socket timeout: ", $sourceClient.getFd().int)
 
 
-proc startRpcSocketServer*(port: Port; router: var RpcRouter) =
+proc startRpcSocketServer*(port: Port; address="", router: var RpcRouter) =
   logi(TAG, "starting json rpc server: buffer: %s", $router.buffer)
 
   startSocketServer[RpcRouter](
     port,
+    address=address,
     readHandler=rpcMsgPackReadHandler,
     writeHandler=rpcMsgPackWriteHandler,
     data=router)

diff --git a/src/nesper/servers/rpc/rpcsocket_mpack.nim b/src/nesper/servers/rpc/rpcsocket_mpack.nim
@@ -42,11 +42,12 @@ proc rpcMsgPackReadHandler*(srv: TcpServerInfo[RpcRouter], result: ReadyKey, sou
     echo("control server: error: socket timeout: ", $sourceClient.getFd().int)
 
 
-proc startRpcSocketServer*(port: Port; router: var RpcRouter) =
+proc startRpcSocketServer*(port: Port; address="", router: var RpcRouter) =
   logi(TAG, "starting mpack rpc server: buffer: %s", $router.buffer)
 
   startSocketServer[RpcRouter](
     port,
+    address=address,
     readHandler=rpcMsgPackReadHandler,
     writeHandler=rpcMsgPackWriteHandler,
     data=router)

diff --git a/src/nesper/servers/tcpsocket.nim b/src/nesper/servers/tcpsocket.nim
@@ -130,13 +130,13 @@ proc echoReadHandler*(srv: TcpServerInfo[string], result: ReadyKey, sourceClient
     for cfd, client in srv.clients:
       client.sendWrap(data & message & "\r\L")
 
-proc startSocketServer*[T](port: Port, readHandler: TcpServerHandler[T], writeHandler: TcpServerHandler[T], data: var T) =
+proc startSocketServer*[T](port: Port, address: string = "", readHandler: TcpServerHandler[T], writeHandler: TcpServerHandler[T], data: var T) =
   var server: Socket = newSocket()
   var select: Selector[T] = newSelector[T]()
 
   server.setSockOpt(OptReuseAddr, true)
   server.getFd().setBlocking(false)
-  server.bindAddr(port)
+  server.bindAddr(port, address=address)
   server.listen()
 
   logi TAG, "Server: started. Listening to new connections on port: %s", $port