refactor in progress

This commit is contained in:
Joseph Henry 2015-09-10 16:52:18 -04:00
commit f4d3c995bc
3 changed files with 134 additions and 122 deletions

View file

@ -95,8 +95,7 @@ private:
void phyOnUnixData(PhySocket *sock,void **uptr,void *data,unsigned long len);
void phyOnUnixWritable(PhySocket *sock,void **uptr);
void handle_kill_intercept(NetconIntercept* h);
int send_return_value(NetconIntercept *h, int retval);
int send_return_value(NetconClient *client, int retval);
// For LWIP Callbacks
err_t nc_poll(void* arg, struct tcp_pcb *tpcb);
@ -109,11 +108,11 @@ private:
err_t nc_connected(void *arg, struct tcp_pcb *tpcb, err_t err);
// RPC handlers (from NetconIntercept)
void handle_bind(NetconIntercept *h, struct bind_st *bind_rpc);
void handle_listen(NetconIntercept *h, struct listen_st *listen_rpc);
void handle_retval(NetconIntercept *h, unsigned char* buf);
void handle_socket(NetconIntercept *h, struct socket_st* socket_rpc);
void handle_connect(NetconIntercept *h, struct connect_st* connect_rpc);
void handle_bind(NetconClient *client, struct bind_st *bind_rpc);
void handle_listen(NetconClient *client, struct listen_st *listen_rpc);
void handle_retval(NetconClient *client, unsigned char* buf);
void handle_socket(NetconClient *client, struct socket_st* socket_rpc);
void handle_connect(NetconClient *client, struct connect_st* connect_rpc);
void handle_write(NetconConnection *c);
void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
@ -121,7 +120,6 @@ private:
// Logging helper
Phy<NetconEthernetTap *> _phy;
PhySocket *_unixListenSocket;