aboutsummaryrefslogtreecommitdiffstats
path: root/libglouglou
diff options
context:
space:
mode:
authorLaurent Ghigonis <laurent@p1sec.com>2012-12-02 13:48:22 +0100
committerLaurent Ghigonis <laurent@p1sec.com>2012-12-02 13:48:22 +0100
commit48ebad3de372518bf3773fd471a616717ca8a48c (patch)
treef7da867d868ddefd53801981f5ff547b779a52cb /libglouglou
parentMerge branch 'sendbuf' (diff)
downloadglouglou-48ebad3de372518bf3773fd471a616717ca8a48c.tar.xz
glouglou-48ebad3de372518bf3773fd471a616717ca8a48c.zip
reorganise functions order.
no functionnal change. TODO--
Diffstat (limited to 'libglouglou')
-rw-r--r--libglouglou/libglouglou.c56
-rw-r--r--libglouglou/libglouglou.h4
2 files changed, 30 insertions, 30 deletions
diff --git a/libglouglou/libglouglou.c b/libglouglou/libglouglou.c
index 5a08e07..090e774 100644
--- a/libglouglou/libglouglou.c
+++ b/libglouglou/libglouglou.c
@@ -101,6 +101,21 @@ err:
return NULL;
}
+void
+gg_server_stop(struct gg_server *srv)
+{
+ struct gg_user *usr;
+
+ while ((usr = LIST_FIRST(&srv->user_list))) {
+ user_del(srv, usr);
+ }
+ if (srv->sock)
+ close(srv->sock);
+ if (srv->ev)
+ event_del(srv->ev);
+ free(srv);
+}
+
int
gg_server_send(struct gg_server *srv, struct gg_packet *pkt, struct gg_user *usr)
{
@@ -130,21 +145,6 @@ gg_server_send(struct gg_server *srv, struct gg_packet *pkt, struct gg_user *usr
return res;
}
-void
-gg_server_stop(struct gg_server *srv)
-{
- struct gg_user *usr;
-
- while ((usr = LIST_FIRST(&srv->user_list))) {
- user_del(srv, usr);
- }
- if (srv->sock)
- close(srv->sock);
- if (srv->ev)
- event_del(srv->ev);
- free(srv);
-}
-
/*
* Server - private
*/
@@ -340,19 +340,6 @@ err:
return NULL;
}
-int
-gg_client_send(struct gg_client *cli, struct gg_packet *pkt)
-{
- static struct gg_packet *newpkt;
- int size;
-
- size = pkt_getsize(pkt);
- newpkt = sendbuf_gettoken(cli->sbuf, size);
- if (!newpkt)
- return -1;
- return pkt_encode(pkt, newpkt);
-}
-
void
gg_client_disconnect(struct gg_client *cli)
{
@@ -369,6 +356,19 @@ gg_client_disconnect(struct gg_client *cli)
free(cli);
}
+int
+gg_client_send(struct gg_client *cli, struct gg_packet *pkt)
+{
+ static struct gg_packet *newpkt;
+ int size;
+
+ size = pkt_getsize(pkt);
+ newpkt = sendbuf_gettoken(cli->sbuf, size);
+ if (!newpkt)
+ return -1;
+ return pkt_encode(pkt, newpkt);
+}
+
/*
* Client - private
*/
diff --git a/libglouglou/libglouglou.h b/libglouglou/libglouglou.h
index 989bdff..3fdd2ae 100644
--- a/libglouglou/libglouglou.h
+++ b/libglouglou/libglouglou.h
@@ -160,15 +160,15 @@ struct gg_server *gg_server_start(struct event_base *, char *, int,
int (*handle_conn)(struct gg_server *, struct gg_user *),
int (*handle_packet)(struct gg_server *, struct gg_user *, struct gg_packet *),
void *);
-int gg_server_send(struct gg_server *, struct gg_packet *, struct gg_user *);
void gg_server_stop(struct gg_server *);
+int gg_server_send(struct gg_server *, struct gg_packet *, struct gg_user *);
struct gg_client *gg_client_connect(struct event_base *, char *, int,
int (*handle_conn)(struct gg_client *),
int (*handle_packet)(struct gg_client *, struct gg_packet *),
void *);
-int gg_client_send(struct gg_client *, struct gg_packet *);
void gg_client_disconnect(struct gg_client *);
+int gg_client_send(struct gg_client *, struct gg_packet *);
int gg_verbosity_get(void);
void gg_verbosity_set(int);