git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makefile - Added libunicode and GUI terminal
[tpg/acess2.git]
/
Usermode
/
Applications
/
telnetd_src
/
main.c
diff --git
a/Usermode/Applications/telnetd_src/main.c
b/Usermode/Applications/telnetd_src/main.c
index
8a66ad7
..
bf6de99
100644
(file)
--- a/
Usermode/Applications/telnetd_src/main.c
+++ b/
Usermode/Applications/telnetd_src/main.c
@@
-1,9
+1,14
@@
/*
/*
+ * Acess2 Telnet Server (TCP server test case)
+ * - By John Hodge (thePowersGang)
+ *
+ * main.c
+ * - All
*/
#include <stddef.h>
#include <net.h>
*/
#include <stddef.h>
#include <net.h>
-#include <unistd.h>
#include <stdio.h>
#include <stdio.h>
+#include <acess/sys.h>
// === TYPES ===
typedef struct sClient
// === TYPES ===
typedef struct sClient
@@
-41,7
+46,7
@@
int main(int argc, char *argv[])
int addrtype = Net_ParseAddress("10.0.2.10", data);
int port = 23;
giServerFD = Net_OpenSocket(addrtype, data, "tcps");
int addrtype = Net_ParseAddress("10.0.2.10", data);
int port = 23;
giServerFD = Net_OpenSocket(addrtype, data, "tcps");
-
ioctl(giServerFD, 4, &port);
// Set port and start listening
+
_SysIOCtl(giServerFD, 4, &port);
// Set port and start listening
}
// Event loop
}
// Event loop
@@
-50,17
+55,17
@@
int main(int argc, char *argv[])
return 0;
}
return 0;
}
+static void FD_SET_MAX(fd_set *set, int fd, int *maxfd)
+{
+ FD_SET(fd, set);
+ if(*maxfd < fd) *maxfd = fd;
+}
+
void EventLoop(void)
{
fd_set fds;
int maxfd;
void EventLoop(void)
{
fd_set fds;
int maxfd;
- void FD_SET_MAX(fd_set *set, int fd, int *maxfd)
- {
- FD_SET(fd, set);
- if(*maxfd < fd) *maxfd = fd;
- }
-
for( ;; )
{
FD_ZERO(&fds);
for( ;; )
{
FD_ZERO(&fds);
@@
-77,7
+82,7
@@
void EventLoop(void)
}
// Select!
}
// Select!
-
select( maxfd+1, &fds, NULL, NULL, NULL
);
+
_SysSelect( maxfd+1, &fds, NULL, NULL, NULL, 0
);
// Check events
if( FD_ISSET(giServerFD, &fds) )
// Check events
if( FD_ISSET(giServerFD, &fds) )
@@
-108,7
+113,7
@@
void Server_NewClient(int FD)
if( giNumClients == giConfig_MaxClients )
{
// Open, reject
if( giNumClients == giConfig_MaxClients )
{
// Open, reject
-
close( _SysOpenChild(FD, "", O_RDWR
) );
+
_SysClose( _SysOpenChild(FD, "", OPENFLAG_READ
) );
return ;
}
return ;
}
@@
-121,18
+126,18
@@
void Server_NewClient(int FD)
}
}
// Accept the connection
}
}
// Accept the connection
- clt->Socket = _SysOpenChild(FD, "", O
_RDWR
);
+ clt->Socket = _SysOpenChild(FD, "", O
PENFLAG_READ|OPENFLAG_WRITE
);
giNumClients ++;
// Create stdin/stdout
giNumClients ++;
// Create stdin/stdout
- clt->stdin =
open("/Devices/fifo/anon", O_RDWR
);
- clt->stdout =
open("/Devices/fifo/anon", O_RDWR
);
+ clt->stdin =
_SysOpen("/Devices/fifo/anon", OPENFLAG_READ|OPENFLAG_WRITE
);
+ clt->stdout =
_SysOpen("/Devices/fifo/anon", OPENFLAG_READ|OPENFLAG_WRITE
);
// TODO: Arguments and envp
{
int fds[3] = {clt->stdin, clt->stdout, clt->stdout};
const char *argv[] = {NULL};
// TODO: Arguments and envp
{
int fds[3] = {clt->stdin, clt->stdout, clt->stdout};
const char *argv[] = {NULL};
- _SysSpawn("/Acess/SBin/login", argv, argv, 3, fds);
+ _SysSpawn("/Acess/SBin/login", argv, argv, 3, fds
, NULL
);
}
}
}
}
@@
-141,9
+146,9
@@
void HandleServerBoundData(tClient *Client)
char buf[BUFSIZ];
int len;
char buf[BUFSIZ];
int len;
- len =
r
ead(Client->Socket, buf, BUFSIZ);
+ len =
_SysR
ead(Client->Socket, buf, BUFSIZ);
if( len <= 0 ) return ;
if( len <= 0 ) return ;
-
w
rite(Client->stdin, buf, len);
+
_SysW
rite(Client->stdin, buf, len);
}
void HandleClientBoundData(tClient *Client)
}
void HandleClientBoundData(tClient *Client)
@@
-151,8
+156,8
@@
void HandleClientBoundData(tClient *Client)
char buf[BUFSIZ];
int len;
char buf[BUFSIZ];
int len;
- len =
r
ead(Client->stdout, buf, BUFSIZ);
+ len =
_SysR
ead(Client->stdout, buf, BUFSIZ);
if( len <= 0 ) return ;
if( len <= 0 ) return ;
-
w
rite(Client->Socket, buf, len);
+
_SysW
rite(Client->Socket, buf, len);
}
}
UCC
git Repository :: git.ucc.asn.au