diff options
author | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-18 22:09:42 -0700 |
---|---|---|
committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-04-18 22:23:16 -0700 |
commit | 7f16d356995d4e9c29105f98d502a7e51a4c775d (patch) | |
tree | 3fc9f782d67f68d44c36d0dff2c197fc33dac206 /src/mmo/socket.hpp | |
parent | 56e149a51562b9d2620bc9037a81735c29ea95af (diff) | |
parent | 6d631217271fcdc57143a7f8e03a2595a93ab50f (diff) | |
download | tmwa-7f16d356995d4e9c29105f98d502a7e51a4c775d.tar.gz tmwa-7f16d356995d4e9c29105f98d502a7e51a4c775d.tar.bz2 tmwa-7f16d356995d4e9c29105f98d502a7e51a4c775d.tar.xz tmwa-7f16d356995d4e9c29105f98d502a7e51a4c775d.zip |
Merge tag 'v14.4.18' into master
Conflicts:
src/admin/ladmin.cpp
src/char/char.cpp
src/login/login.cpp
src/map/chrif.cpp
src/map/clif.cpp
src/mmo/socket.cpp
Diffstat (limited to 'src/mmo/socket.hpp')
-rw-r--r-- | src/mmo/socket.hpp | 49 |
1 files changed, 40 insertions, 9 deletions
diff --git a/src/mmo/socket.hpp b/src/mmo/socket.hpp index 3b411e3..c166794 100644 --- a/src/mmo/socket.hpp +++ b/src/mmo/socket.hpp @@ -51,16 +51,40 @@ struct SessionDeleter void operator()(SessionData *sd); }; -// Struct declaration +struct Session; +struct SessionIO +{ + void (*func_recv)(Session *); + void (*func_send)(Session *); +}; + +struct SessionParsers +{ + void (*func_parse)(Session *); + void (*func_delete)(Session *); +}; struct Session { + Session(SessionIO, SessionParsers); + Session(Session&&) = delete; + Session& operator = (Session&&) = delete; + + void set_io(SessionIO); + void set_parsers(SessionParsers); + /// Checks whether a newly-connected socket actually does anything TimeT created; bool connected; +private: /// Flag needed since structure must be freed in a server-dependent manner bool eof; +public: + void set_eof() { eof = true; } + + /// Currently used by clif_setwaitclose + Timer timed_close; /// Since this is a single-threaded application, it can't block /// These are the read/write queues @@ -74,6 +98,7 @@ struct Session IP4Address client_ip; +private: /// Send or recieve /// Only called when select() indicates the socket is ready /// If, after that, nothing is read, it sets eof @@ -83,12 +108,23 @@ struct Session /// This is the important one /// Set to different functions depending on whether the connection /// is a player or a server/ladmin - /// Can be set explicitly or via set_defaultparse void (*func_parse)(Session *); + /// Cleanup function since we're not fully RAII yet + void (*func_delete)(Session *); + +public: + // this really ought to be part of session_data, once that gets sane + SessionParsers for_inferior; + /// Server-specific data type + // (this really should include the deleter, but ...) std::unique_ptr<SessionData, SessionDeleter> session_data; io::FD fd; + + friend void do_sendrecv(interval_t next); + friend void do_parsepacket(void); + friend void delete_session(Session *); }; inline @@ -123,10 +159,10 @@ IteratorPair<ValueIterator<io::FD, IncrFD>> iter_fds(); /// open a socket, bind, and listen. Return an fd, or -1 if socket() fails, /// but exit if bind() or listen() fails -Session *make_listen_port(uint16_t port); +Session *make_listen_port(uint16_t port, SessionParsers inferior); /// Connect to an address, return a connected socket or -1 // FIXME - this is IPv4 only! -Session *make_connection(IP4Address ip, uint16_t port); +Session *make_connection(IP4Address ip, uint16_t port, SessionParsers); /// free() the structure and close() the fd void delete_session(Session *); /// Make a the internal queues bigger @@ -136,11 +172,6 @@ void do_sendrecv(interval_t next); /// Call the parser function for every socket that has read data void do_parsepacket(void); -/// Change the default parser for newly connected clients -// typically called once per server, but individual clients may identify -// themselves as servers -void set_defaultparse(void(*defaultparse)(Session *)); - template<class T> uint8_t *pod_addressof_m(T& structure) { |