1 files changed, 10 insertions, 14 deletions
diff --git a/client.h b/client.h
index 028e112..d83bb2a 100644
--- a/client.h
+++ b/client.h
@@ -1,19 +1,15 @@
 #include "main.h"
-#define CLIENT_STATE_INITIAL 1
+enum CLIENT_STATE {
-#define CLIENT_STATE_REQUEST_SENT 2
+    CLIENT_STATE_AWAIT_FRIENDSHIP,
-#define CLIENT_STATE_REQUEST_ACCEPTED 3
+    CLIENT_STATE_AWAIT_FRIEND_CONNECTED,
-#define CLIENT_STATE_PING_SENT 4
+    CLIENT_STATE_AWAIT_PONG,
-#define CLIENT_STATE_CONNECTED 5
+    CLIENT_STATE_AWAIT_TUNNEL,
-#define CLIENT_STATE_PONG_RECEIVED 6
+    CLIENT_STATE_SEND_PING,
-#define CLIENT_STATE_SEND_PING 7
+    CLIENT_STATE_REQUEST_TUNNEL,
-#define CLIENT_STATE_REQUEST_TUNNEL 8
+    CLIENT_STATE_WAIT_FOR_ACKTUNNEL,
-#define CLIENT_STATE_WAIT_FOR_ACKTUNNEL 9
+    CLIENT_STATE_CONNECTED
-#define CLIENT_STATE_FORWARDING 10
+};
-#define CLIENT_STATE_SHUTDOWN 11
-#define CLIENT_STATE_BIND_PORT 12
-#define CLIENT_STATE_SETUP_PIPE 13
-#define CLIENT_STATE_CONNECTION_LOST 14
 int handle_pong_frame();
 int handle_acktunnel_frame(protocol_frame *rcvd_frame);

diff --git a/client.h b/client.h index 028e112..d83bb2a 100644 --- a/client.h +++ b/client.h
@@ -1,19 +1,15 @@
1	#include "main.h"	1	#include "main.h"
2		2
3	#define CLIENT_STATE_INITIAL 1	3	enum CLIENT_STATE {
4	#define CLIENT_STATE_REQUEST_SENT 2	4	CLIENT_STATE_AWAIT_FRIENDSHIP,
5	#define CLIENT_STATE_REQUEST_ACCEPTED 3	5	CLIENT_STATE_AWAIT_FRIEND_CONNECTED,
6	#define CLIENT_STATE_PING_SENT 4	6	CLIENT_STATE_AWAIT_PONG,
7	#define CLIENT_STATE_CONNECTED 5	7	CLIENT_STATE_AWAIT_TUNNEL,
8	#define CLIENT_STATE_PONG_RECEIVED 6	8	CLIENT_STATE_SEND_PING,
9	#define CLIENT_STATE_SEND_PING 7	9	CLIENT_STATE_REQUEST_TUNNEL,
10	#define CLIENT_STATE_REQUEST_TUNNEL 8	10	CLIENT_STATE_WAIT_FOR_ACKTUNNEL,
11	#define CLIENT_STATE_WAIT_FOR_ACKTUNNEL 9	11	CLIENT_STATE_CONNECTED
12	#define CLIENT_STATE_FORWARDING 10	12	};
13	#define CLIENT_STATE_SHUTDOWN 11
14	#define CLIENT_STATE_BIND_PORT 12
15	#define CLIENT_STATE_SETUP_PIPE 13
16	#define CLIENT_STATE_CONNECTION_LOST 14
17		13
18	int handle_pong_frame();	14	int handle_pong_frame();
19	int handle_acktunnel_frame(protocol_frame *rcvd_frame);	15	int handle_acktunnel_frame(protocol_frame *rcvd_frame);