comparison network.h @ 564:6e5789cbb4d4

Change network layer error/info message passing API to pass direct strings instead of fmt+ap varargs in the connection context callback functions. Also rename the callback functions in the main program.
author Matti Hamalainen <ccr@tnsp.org>
date Thu, 15 Nov 2012 20:27:44 +0200
parents 52c56ada3816
children 97a49a6cc959
comparison
equal deleted inserted replaced
563:c3e4e8f3c658 564:6e5789cbb4d4
89 89
90 int socket; 90 int socket;
91 struct in_addr addr; 91 struct in_addr addr;
92 fd_set sockfds; 92 fd_set sockfds;
93 93
94 void (*errfunc)(struct _nn_conn_t *conn, const char *fmt, va_list ap); 94 void (*errfunc)(struct _nn_conn_t *conn, const char *msg);
95 void (*msgfunc)(struct _nn_conn_t *conn, const char *fmt, va_list ap); 95 void (*msgfunc)(struct _nn_conn_t *conn, const char *msg);
96 96
97 int err; 97 int err;
98 int status; 98 int status;
99 99
100 char buf[NN_CONNBUF_SIZE + 16]; 100 char buf[NN_CONNBUF_SIZE + 16];
107 BOOL nn_network_init(); 107 BOOL nn_network_init();
108 void nn_network_close(void); 108 void nn_network_close(void);
109 109
110 struct hostent *nn_resolve_host(nn_conn_t *conn, const char *name); 110 struct hostent *nn_resolve_host(nn_conn_t *conn, const char *name);
111 nn_conn_t * nn_conn_new( 111 nn_conn_t * nn_conn_new(
112 void (*errfunc)(nn_conn_t *conn, const char *fmt, va_list ap), 112 void (*errfunc)(nn_conn_t *conn, const char *msg),
113 void (*msgfunc)(nn_conn_t *conn, const char *fmt, va_list ap)); 113 void (*msgfunc)(nn_conn_t *conn, const char *msg));
114 114
115 int nn_conn_set_proxy(nn_conn_t *conn, int type, int port, const char *host); 115 int nn_conn_set_proxy(nn_conn_t *conn, int type, int port, const char *host);
116 int nn_conn_open(nn_conn_t *conn, const int port, const char *host); 116 int nn_conn_open(nn_conn_t *conn, const int port, const char *host);
117 void nn_conn_close(nn_conn_t *); 117 void nn_conn_close(nn_conn_t *);
118 void nn_conn_reset(nn_conn_t *); 118 void nn_conn_reset(nn_conn_t *);