diff options
| author | Håkon Nessjøen <haakon.nessjoen@gmail.com> | 2010-12-26 15:28:37 +0100 |
|---|---|---|
| committer | Håkon Nessjøen <haakon.nessjoen@gmail.com> | 2010-12-26 15:28:37 +0100 |
| commit | 98b82ee3a77ef4ffd79472e0fd56d6deced1d8e4 (patch) | |
| tree | 044896a53a60114a09772a441d9e6c8af212d699 | |
| parent | 425d09a5ddbb1aed1c6c11a11165719fa63d0a5e (diff) | |
| download | MAC-Telnet-98b82ee3a77ef4ffd79472e0fd56d6deced1d8e4.tar.gz MAC-Telnet-98b82ee3a77ef4ffd79472e0fd56d6deced1d8e4.zip | |
Code cleanup, and made timeout-acking more correct
| -rw-r--r-- | mactelnetd.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mactelnetd.c b/mactelnetd.c index 67980a3..7196a30 100644 --- a/mactelnetd.c +++ b/mactelnetd.c @@ -64,9 +64,11 @@ unsigned char mt_direction_fromserver = 1; #define MT_CONNECTION_TIMEOUT 15 /* Connection states */ -#define STATE_AUTH 1 -#define STATE_CLOSED 2 -#define STATE_ACTIVE 3 +enum mt_connection_state { + STATE_AUTH, + STATE_CLOSED, + STATE_ACTIVE +}; /** Connection struct */ struct mt_connection { @@ -76,7 +78,7 @@ struct mt_connection { time_t lastdata; int terminal_mode; - int state; + enum mt_connection_state state; int ptsfd; int slavefd; int pid; @@ -333,7 +335,7 @@ static void user_login(struct mt_connection *curconn, struct mt_mactelnet_hdr *p syslog(LOG_INFO, "(%d) User %s logged in.", curconn->seskey, curconn->username); - /* Initialize terminal environment */ + /* Initialize terminal environment */ setenv("USER", user->pw_name, 1); setenv("HOME", user->pw_dir, 1); setenv("SHELL", user->pw_shell, 1); @@ -519,20 +521,18 @@ static void handle_packet(unsigned char *data, int data_len, const struct sockad if (curconn == NULL) { break; } - curconn->lastdata = time(NULL); if (pkthdr.counter <= curconn->outcounter) { curconn->wait_for_ack = 0; } - if (pkthdr.counter == curconn->outcounter) { + if (time(0) - curconn->lastdata > 9) { // Answer to anti-timeout packet - /* TODO: only answer if time() - lastpacket is somewhat high.. */ init_packet(&pdata, MT_PTYPE_ACK, pkthdr.dstaddr, pkthdr.srcaddr, pkthdr.seskey, pkthdr.counter); send_udp(curconn, &pdata); } - return; - break; + curconn->lastdata = time(NULL); + return; case MT_PTYPE_DATA: curconn = list_find_connection(pkthdr.seskey, (unsigned char *)&(pkthdr.srcaddr)); |