oxmox/doompanning
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

preparations for also using nng_tcp as a transport

Browse source
This commit is contained in:
oxmox 2023-02-22 19:17:06 +01:00
parent 8b5231a782
commit 98c44f66df
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/doompanning.cc
View file

@ -788,8 +788,8 @@ int main(int argc, char *argv[])
nng_set_resolve_thread_max(1); nng_set_resolve_thread_max(1);
ControllerContext ctx; ControllerContext ctx;
ctx.pub = make_ctrl_pub(CtrlUrl); ctx.pub = make_ctrl_pub(CtrlUrlIpc);
ctx.sub = make_ctrl_sub(DoomUrl); ctx.sub = make_ctrl_sub(DoomUrlIpc);
ctx.window = window; ctx.window = window;
ctx.renderer = renderer; ctx.renderer = renderer;
ctx.pixelBuffer.fill(0u); ctx.pixelBuffer.fill(0u);

4
src/doomsim.cc
View file

@ -194,8 +194,8 @@ int main(int argc, char *argv[])
dp_nng_init_limits(1, 1, 1); dp_nng_init_limits(1, 1, 1);
auto pubSock = make_doom_pub(DoomUrl); auto pubSock = make_doom_pub(DoomUrlIpc);
auto subSock = make_doom_sub(CtrlUrl); auto subSock = make_doom_sub(CtrlUrlIpc);
DoomContext ctx DoomContext ctx
{ {

7
src/dp_common.h
View file

@ -95,8 +95,11 @@ static inline bool dp_nng_is_timeout(int res)
return res == NNG_ETIMEDOUT || res == NNG_EAGAIN; return res == NNG_ETIMEDOUT || res == NNG_EAGAIN;
} }
static const char *const CtrlUrl = "ipc://666_ctrl.socket"; // controller publishes here // Controller listens, Dooms dial.
static const char *const DoomUrl = "ipc://666_doom.socket"; // dooms publish here static const char *const CtrlUrlIpc = "ipc://666_ctrl.socket"; // controller publishes here
static const char *const DoomUrlIpc = "ipc://666_doom.socket"; // dooms publish here
static const char *const CtrlUrlTcp = "tcp4://:42666"; // controller publishes here
static const char *const DoomUrlTcp = "tcp4://:42667"; // dooms publish here
nng_socket make_ctrl_pub(const char *url); nng_socket make_ctrl_pub(const char *url);
nng_socket make_ctrl_sub(const char *url); nng_socket make_ctrl_sub(const char *url);

4
src/dp_doom/linuxdoom-1.10/ib_video/ib_video_nng.c
View file

@ -328,8 +328,8 @@ void IB_InitGraphics(const char *title, size_t screen_width, size_t screen_heigh
dp_nng_init_limits(1, 1, 1); dp_nng_init_limits(1, 1, 1);
g_doomContext.pub = make_doom_pub(DoomUrl); g_doomContext.pub = make_doom_pub(DoomUrlIpc);
g_doomContext.sub = make_doom_sub(CtrlUrl); g_doomContext.sub = make_doom_sub(CtrlUrlIpc);
g_doomContext.id = getpid(); g_doomContext.id = getpid();
g_doomContext.state = DP_DS_Ready; g_doomContext.state = DP_DS_Ready;
g_doomContext.f = do_doom_ready; g_doomContext.f = do_doom_ready;