X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Ftelnetd_src%2Fmain.c;h=fa852506a155637f88c54dbb3d41449922005523;hb=4239ff15de51d3eb299bbebf4f63077edcc0d2db;hp=6ef832f371222c039f70c488fe9537c9ae343311;hpb=400a3ecf2e02dd4cd1c24c10249539124379dc66;p=tpg%2Facess2.git diff --git a/Usermode/Applications/telnetd_src/main.c b/Usermode/Applications/telnetd_src/main.c index 6ef832f3..fa852506 100644 --- a/Usermode/Applications/telnetd_src/main.c +++ b/Usermode/Applications/telnetd_src/main.c @@ -10,6 +10,10 @@ #include #include #include +#include +#include +#include +#include // === TYPES === enum eTelnetMode @@ -19,7 +23,10 @@ enum eTelnetMode MODE_WILL, MODE_WONT, MODE_DO, - MODE_DONT + MODE_DONT, + MODE_SUBNEG_OPTION, + MODE_SUBNEG_DATA, + MODE_SUBNEG_IAC, }; typedef struct sClient @@ -34,6 +41,7 @@ void EventLoop(void); void Server_NewClient(int FD); void HandleServerBoundData(tClient *Client); void HandleClientBoundData(tClient *Client); +void HandleOptionRequest(tClient *Client, int Option, bool Value, bool IsRequest); // === GLOBALS === // --- Configuration --- @@ -86,14 +94,13 @@ void EventLoop(void) for( int i = 0; i < giConfig_MaxClients; i ++ ) { if( gaClients[i].Socket == 0 ) continue ; - _SysDebug("Socket = %i, pty = %i", - gaClients[i].Socket, gaClients[i].pty); FD_SET_MAX(&fds, gaClients[i].Socket, &maxfd); FD_SET_MAX(&fds, gaClients[i].pty, &maxfd); } // Select! - _SysSelect( maxfd+1, &fds, NULL, NULL, NULL, 0 ); + int rv = _SysSelect( maxfd+1, &fds, NULL, NULL, NULL, 0 ); + _SysDebug("Select return %i", rv); // Check events if( FD_ISSET(giServerFD, &fds) ) @@ -118,7 +125,7 @@ void EventLoop(void) void Server_NewClient(int FD) { - tClient *clt; + tClient *clt = NULL; // TODO: Is this done in the IPStack? if( giNumClients == giConfig_MaxClients ) @@ -136,23 +143,35 @@ void Server_NewClient(int FD) break; } } + assert(clt); // Accept the connection clt->Socket = _SysOpenChild(FD, "", OPENFLAG_READ|OPENFLAG_WRITE); giNumClients ++; - // Create stdin/stdout - // - Current PTY code is strange with mknod - clt->pty = _SysOpen("/Devices/pts/telnetd0", OPENFLAG_CREATE|OPENFLAG_READ|OPENFLAG_WRITE); + // Create PTY + // TODO: Use PTYs + clt->pty = _SysOpen("/Devices/pts/ptmx", OPENFLAG_READ|OPENFLAG_WRITE); if( clt->pty < 0 ) { - perror("Unable to open server PTY"); + perror("Unable to create/open PTY"); + _SysDebug("Unable to create/open PTY: %s", strerror(errno)); _SysClose(clt->Socket); clt->Socket = 0; return ; } + // - Initialise + { + _SysIOCtl(clt->pty, PTY_IOCTL_SETID, "telnetd#"); + struct ptymode mode = {.InputMode = 0, .OutputMode=0}; + struct ptydims dims = {.W = 80, .H = 25}; + _SysIOCtl(clt->pty, PTY_IOCTL_SETMODE, &mode); + _SysIOCtl(clt->pty, PTY_IOCTL_SETDIMS, &dims); + } // TODO: Arguments and envp { - int clientfd = _SysOpen("/Devices/pts/telnetd0c", OPENFLAG_READ|OPENFLAG_WRITE); + char pty_path[] = "/Devices/pts/telnetd000"; + _SysIOCtl(clt->pty, PTY_IOCTL_GETID, pty_path+13); + int clientfd = _SysOpen(pty_path, OPENFLAG_READ|OPENFLAG_WRITE); if(clientfd < 0) { perror("Unable to open login PTY"); _SysClose(clt->Socket); @@ -160,9 +179,11 @@ void Server_NewClient(int FD) clt->Socket = 0; return ; } + _SysDebug("Using client PTY %s", pty_path); int fds[3] = {clientfd, clientfd, clientfd}; const char *argv[] = {"login", NULL}; _SysSpawn("/Acess/SBin/login", argv, argv, 3, fds, NULL); + _SysClose(clientfd); } } @@ -170,14 +191,16 @@ void HandleServerBoundData(tClient *Client) { uint8_t buf[BUFSIZ]; size_t len; - + + _SysDebug("Client %p", Client); len = _SysRead(Client->Socket, buf, BUFSIZ); + _SysDebug("%i bytes for %p", len, Client); if( len == 0 ) return ; if( len == -1 ) { return ; } // handle options - int last_flush = 0; + // int last_flush = 0; for( int i = 0; i < len; i ++ ) { switch(Client->Mode) @@ -187,6 +210,8 @@ void HandleServerBoundData(tClient *Client) switch(buf[i]) { case 240: // End of subnegotiation parameters + _SysDebug("End Subnegotiation"); + break; case 241: // Nop break; case 242: // SYNCH @@ -199,42 +224,76 @@ void HandleServerBoundData(tClient *Client) case 247: // Function 'EC' case 248: // Function 'EL' case 249: // GA Signal + break; case 250: // Subnegotation + _SysDebug("Subnegotiation"); + // TODO: Get option ID, and then cache until 'END SB' (240) + Client->Mode = MODE_SUBNEG_OPTION; break; case 251: // WILL Client->Mode = MODE_WILL; break; case 252: // WONT - Client->Mode = MODE_WILL; + Client->Mode = MODE_WONT; break; case 253: // DO - Client->Mode = MODE_WILL; + Client->Mode = MODE_DO; break; case 254: // DONT - Client->Mode = MODE_WILL; + Client->Mode = MODE_DONT; break; case 255: // Literal 255 - Client->Mode = MODE_DATA; - i --; // hacky! + _SysWrite(Client->pty, buf+i, 1); break; } break; case MODE_WILL: _SysDebug("Option %i WILL", buf[i]); + HandleOptionRequest(Client, buf[i], true, false); Client->Mode = MODE_DATA; break; case MODE_WONT: _SysDebug("Option %i WONT", buf[i]); + HandleOptionRequest(Client, buf[i], false, false); Client->Mode = MODE_DATA; break; case MODE_DO: _SysDebug("Option %i DO", buf[i]); + HandleOptionRequest(Client, buf[i], true, true); Client->Mode = MODE_DATA; break; case MODE_DONT: _SysDebug("Option %i DONT", buf[i]); + HandleOptionRequest(Client, buf[i], false, true); Client->Mode = MODE_DATA; break; + case MODE_SUBNEG_OPTION: + _SysDebug("Option %i subnegotation", buf[i]); + Client->Mode = MODE_SUBNEG_DATA; + break; + case MODE_SUBNEG_IAC: + switch(buf[i]) + { + case 240: // End subnegotation + // TODO: Handle subnegotation data + Client->Mode = MODE_DATA; + break; + case 255: + // TODO: Literal 255 + Client->Mode = MODE_SUBNEG_DATA; + break; + default: + _SysDebug("Unexpected %i in SUBNEG IAC", buf[i]); + Client->Mode = MODE_SUBNEG_DATA; + break; + } + case MODE_SUBNEG_DATA: + if( buf[i] == 255 ) + Client->Mode = MODE_SUBNEG_IAC; + else + ;//_SysWrite(Client->pty, buf+i, 1); + break; + case MODE_DATA: if( buf[i] == 255 ) Client->Mode = MODE_IAC; @@ -255,3 +314,13 @@ void HandleClientBoundData(tClient *Client) _SysWrite(Client->Socket, buf, len); } +void HandleOptionRequest(tClient *Client, int Option, bool Value, bool IsRequest) +{ + switch(Option) + { + default: + _SysDebug("Unknown option %i", Option); + break; + } +} +