summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-07 06:25:00 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-02-07 06:25:00 +0000
commitcaa2c43f341ab070ff82d99410ffab773ba19e72 (patch)
treebdacd386345c40a82372d6e792973a0322e5286f /src/common
parenta397e43494e3e4ffb4015b52c04f026dcaa7e3ca (diff)
downloadhercules-caa2c43f341ab070ff82d99410ffab773ba19e72.tar.gz
hercules-caa2c43f341ab070ff82d99410ffab773ba19e72.tar.bz2
hercules-caa2c43f341ab070ff82d99410ffab773ba19e72.tar.xz
hercules-caa2c43f341ab070ff82d99410ffab773ba19e72.zip
- Removed deprecated console code.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9815 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/socket.c60
-rw-r--r--src/common/socket.h4
2 files changed, 3 insertions, 61 deletions
diff --git a/src/common/socket.c b/src/common/socket.c
index e8c4f68ab..1dd85489d 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -86,8 +86,6 @@ struct socket_data *session[FD_SETSIZE];
static int null_parse(int fd);
static int (*default_func_parse)(int) = null_parse;
-static int null_console_parse(char *buf);
-static int (*default_console_parse)(char*) = null_console_parse;
#ifndef MINICORE
static int connect_check(unsigned int ip);
#else
@@ -344,38 +342,6 @@ int make_listen_port(int port)
return make_listen_bind(INADDR_ANY,port);
}
-// Console Reciever [Wizputer]
-int console_recieve(int i)
-{
- int n;
- char *buf;
-
- CREATE(buf, char, 64);
-
- n = read(0, buf , 64);
- if ( n < 0 )
- ShowError("Console input read error\n");
- else
- {
- ShowNotice ("Sorry, the console is currently non-functional.\n");
-// session[0]->func_console(buf);
- }
-
- aFree(buf);
- return 0;
-}
-
-void set_defaultconsoleparse(int (*defaultparse)(char*))
-{
- default_console_parse = defaultparse;
-}
-
-static int null_console_parse(char *buf)
-{
- ShowMessage("null_console_parse : %s\n",buf);
- return 0;
-}
-
// function parse table
// To-do: -- use dynamic arrays
// -- add a register_parse_func();
@@ -401,26 +367,6 @@ void func_parse_check (struct socket_data *sd)
sd->type = SESSION_RAW;
}
-// Console Input [Wizputer]
-int start_console(void)
-{
- //Until a better plan is came up with... can't be using session[0] anymore! [Skotlex]
- ShowNotice("The console is currently nonfunctional.\n");
- return 0;
-
- FD_SET(0,&readfds);
-
- if (!session[0]) { // dummy socket already uses fd 0
- CREATE(session[0], struct socket_data, 1);
- }
- memset(session[0],0,sizeof(*session[0]));
-
- session[0]->func_recv = console_recieve;
- session[0]->func_console = default_console_parse;
-
- return 0;
-}
-
int make_connection(long ip,int port)
{
struct sockaddr_in server_address;
@@ -1249,8 +1195,9 @@ void socket_init(void)
// initialise last send-receive tick
last_tick = time(0);
- // session[0] Was for the console (whatever that was?), but is now currently used for disconnected sessions of the map
- // server, and as such, should hold enough buffer (it is a vacuum so to speak) as it is never flushed. [Skotlex]
+ // session[0] is for disconnected sessions of the map server, and as such,
+ // should hold enough buffer (it is a vacuum so to speak) as it is never flushed. [Skotlex]
+ //##TODO "flush" this session periodically O.O [FlavioJS]
CREATE(session[0], struct socket_data, 1);
CREATE(session[0]->rdata, unsigned char, 2*rfifo_size);
CREATE(session[0]->wdata, unsigned char, 2*wfifo_size);
@@ -1272,7 +1219,6 @@ void socket_init(void)
int session_isValid(int fd)
{ //End of Exam has pointed out that fd==0 is actually an unconnected session! [Skotlex]
- //But this is not so true, it is used... for... something. The console uses it, would this not cause problems? [Skotlex]
return ( (fd>0) && (fd<FD_SETSIZE) && (NULL!=session[fd]) );
}
diff --git a/src/common/socket.h b/src/common/socket.h
index 43e433ab0..7cf0fcd91 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -121,7 +121,6 @@ struct socket_data{
int (*func_recv)(int);
int (*func_send)(int);
int (*func_parse)(int);
- int (*func_console)(char*);
void* session_data;
void* session_data2;
enum SessionType type;
@@ -168,10 +167,7 @@ extern void flush_fifo(int fd);
extern void flush_fifos(void);
extern void set_nonblocking(int fd, int yes);
-int start_console(void);
-
void set_defaultparse(int (*defaultparse)(int));
-void set_defaultconsoleparse(int (*defaultparse)(char*));
//Resolves the hostname and stores the string representation of the string in ip.
//Meant to simplify calls to gethostbyname without the need of all the