summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2017-01-06 10:55:40 -0500
committermidipix <writeonce@midipix.org>2017-01-07 11:41:04 -0500
commit0fbfb0981f4c3ae451a1e0136408f10452790c4f (patch)
tree5d5f9f5d65b04bccf4a1decc2b7528d6eae3c91d
parent97d3f37f9f03c7bf99d633701c7dd8ad920c50ed (diff)
downloadptycon-0fbfb0981f4c3ae451a1e0136408f10452790c4f.tar.bz2
ptycon-0fbfb0981f4c3ae451a1e0136408f10452790c4f.tar.xz
process initialization: added proper session chain support.
-rw-r--r--src/ptycon.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/src/ptycon.c b/src/ptycon.c
index 8f5bd52..5caa104 100644
--- a/src/ptycon.c
+++ b/src/ptycon.c
@@ -66,7 +66,7 @@ static int32_t ptycon_start(int argc, char ** argv, char ** envp)
&ptycon_daemon_guid);
/* no tty session? */
- if (!rtdata->srv_keys[0])
+ if (!rtdata->tty_keys[0])
return ptyc_main(argc,argv,envp);
/* tty */
@@ -76,17 +76,16 @@ static int32_t ptycon_start(int argc, char ** argv, char ** envp)
port_attr.type = NT_PORT_TYPE_SUBSYSTEM;
port_attr.subtype = NT_PORT_SUBTYPE_DEFAULT;
- port_attr.keys.key[0] = rtdata->srv_keys[0];
- port_attr.keys.key[1] = rtdata->srv_keys[1];
- port_attr.keys.key[2] = rtdata->srv_keys[2];
- port_attr.keys.key[3] = rtdata->srv_keys[3];
- port_attr.keys.key[4] = rtdata->srv_keys[4];
- port_attr.keys.key[5] = rtdata->srv_keys[5];
+ port_attr.keys.key[0] = rtdata->tty_keys[0];
+ port_attr.keys.key[1] = rtdata->tty_keys[1];
+ port_attr.keys.key[2] = rtdata->tty_keys[2];
+ port_attr.keys.key[3] = rtdata->tty_keys[3];
+ port_attr.keys.key[4] = rtdata->tty_keys[4];
+ port_attr.keys.key[5] = rtdata->tty_keys[5];
- ntapi->tt_port_guid_from_type(
+ ntapi->tt_guid_copy(
&port_attr.guid,
- port_attr.type,
- port_attr.subtype);
+ &rtdata->tty_guid);
if ((status = ntapi->tty_join_session(
&rtdata->hsession,0,