Mercurial > hg > nnchat
diff libnnchat.h @ 390:acea18a741e3
Cleanup libnnchat.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 24 May 2012 00:47:31 +0300 |
parents | ebbe97f2a2a5 |
children | 318a71f4f57f |
line wrap: on
line diff
--- a/libnnchat.h Sun May 20 23:35:00 2012 +0300 +++ b/libnnchat.h Thu May 24 00:47:31 2012 +0300 @@ -35,42 +35,49 @@ #define NN_DELAY_USEC (15 * 1000) #define NN_BACKBUF_LEN (512) /* Backbuffer size (in lines) */ -enum { +enum +{ NN_CONN_UNINIT = 0, NN_CONN_PROXY_NEG, NN_CONN_OPEN, NN_CONN_CLOSED }; -enum { +enum +{ NN_PROXY_NONE = 0, NN_PROXY_SOCKS4, NN_PROXY_SOCKS4A, - + NN_PROXY_LAST }; -enum { +enum +{ SOCKS_CMD_CONNECT = 1, SOCKS_CMD_BIND = 2 }; -struct nn_socks_t { +struct nn_socks_t +{ uint8_t version; uint8_t command; in_port_t port; in_addr_t addr; } __attribute__((__packed__)); -struct nn_socks_res_t { +struct nn_socks_res_t +{ uint8_t nb; uint8_t result; in_port_t port; in_addr_t addr; } __attribute__((__packed__)); -typedef struct _nn_conn_t { - struct { +typedef struct _nn_conn_t +{ + struct + { char *host; struct hostent *hst; int type; @@ -91,7 +98,7 @@ int err; int status; - + char buf[NN_CONNBUF_SIZE + 16]; char *ptr; ssize_t got, total; @@ -104,8 +111,8 @@ struct hostent *nn_resolve_host(nn_conn_t *conn, const char *name); nn_conn_t * nn_conn_new( - void (*errfunc)(nn_conn_t *conn, const char *fmt, va_list ap), - void (*msgfunc)(nn_conn_t *conn, const char *fmt, va_list ap)); + void (*errfunc)(nn_conn_t *conn, const char *fmt, va_list ap), + void (*msgfunc)(nn_conn_t *conn, const char *fmt, va_list ap)); int nn_conn_set_proxy(nn_conn_t *conn, int type, int port, const char *host); int nn_conn_open(nn_conn_t *conn, const int port, const char *host); @@ -117,13 +124,15 @@ BOOL nn_conn_check(nn_conn_t *); -typedef struct _nn_user_t { +typedef struct _nn_user_t +{ char *name; time_t lastspoke, joined; struct _nn_user_t *next; } nn_user_t; -typedef struct { +typedef struct +{ nn_user_t *buckets[NN_NUM_BUCKETS]; } nn_userhash_t; @@ -151,7 +160,8 @@ char * nn_username_decode(char *str); -typedef struct { +typedef struct +{ ssize_t pos, len, size; char *data; } nn_editbuf_t; @@ -167,14 +177,15 @@ char * nn_editbuf_get_string(nn_editbuf_t *buf, ssize_t start, ssize_t end); -typedef struct { +typedef struct +{ qringbuf_t *data; /* "Backbuffer" data for this window */ int pos; /* Current position in the window, 0 = real time */ BOOL dirty; char *id; /* Chatter ID, NULL = main window */ int num; /* Window number */ - + char *buf; size_t len, bufsize; size_t chlen; @@ -184,7 +195,8 @@ void nn_window_free(nn_window_t *); -typedef struct { +typedef struct +{ size_t len; char *str; } nn_strtuple_t;