Small refactor (init/gl to world/gl)

src/Makefile

@@ -8,7 +8,7 @@ CC=cc
 
 all: sim client
 
-sim: sim.o init.o server.o world.o robot.o
+sim: sim.o server.o world.o robot.o
 	$(CC) $(LDFLAGS) $+ -o $@
 
 client: client.o

src/include/server.h

@@ -1,6 +1,6 @@
 #ifndef SERVER_H
 #define SERVER_H
 
-robotCommand readMessage(void);
+int initServer(int *argcp, char **argv);
 
 #endif /* SERVER_H */

src/include/world.h

@@ -1,6 +1,7 @@
 #ifndef WORLD_H
 #define WORLD_H
 
+void initGlut(int *argcp, char **argv);
 void display(void);
 
 #endif /* WORLD_H */

src/server.c

@@ -1,19 +1,128 @@
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
+#include <event.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/un.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #include "include/sim.h"
+#include "include/server.h"
+
+int setnonblock(int fd);
+void buf_read_callback(struct bufferevent *incoming, void *arg);
+void buf_write_callback(struct bufferevent *bev, void *arg);
+void buf_error_callback(struct bufferevent *bev, short what, void *arg);
+void accept_callback(int fd, short ev, void *arg);
+
+struct client {
+	int fd;
+	struct bufferevent *buf_ev;
+};
+
+int setnonblock(int fd) {
+	int flags;
+
+	flags = fcntl(fd, F_GETFL);
+	flags |= O_NONBLOCK;
+	fcntl(fd, F_SETFL, flags);
+}
+
+void buf_read_callback(struct bufferevent *incoming, void *arg) {
+	struct evbuffer *evreturn;
+	char *req;
+
+	req = evbuffer_readline(incoming->input);
+	if(req == NULL)
+		return;
+
+	evreturn = evbuffer_new();
+	evbuffer_add_printf(evreturn, "You said %s\n", req);
+	bufferevent_write_buffer(incoming, evreturn);
+	evbuffer_free(evreturn);
+	free(req);
+}
+
+void buf_write_callback(struct bufferevent *bev, void *arg) {
+
+}
 
-robotCommand readMessage(void) {
+void buf_error_callback(struct bufferevent *bev, short what, void *arg) {
+	struct client *client = (struct client *)arg;
+	bufferevent_free(client->buf_ev);
+	close(client->fd);
+	free(client);
+}
+
+void accept_callback(int fd, short ev, void *arg) {
+	int client_fd;
+	struct sockaddr_in client_addr;
+	socklen_t client_len = sizeof(client_addr);
+	struct client *client;
 
+	client_fd = accept(fd, (struct sockaddr *)&client_addr, &client_len);
+	if(client_fd < 0) {
+		warn("Client: accept() failed");
+		return;
+	}
 
+	setnonblock(client_fd);
 
+	client = calloc(1, sizeof(*client));
+	if(client == NULL)
+		err(1, "malloc failed");
+	client->fd = client_fd;
 
-	return;
+	client->buf_ev = bufferevent_new(client_fd, buf_read_callback, buf_write_callback, buf_error_callback, client);
+	bufferevent_enable(client->buf_ev, EV_READ);
 }
 
+int initServer(int *argcp, char **argv) {
+	int socketlisten;
+	struct sockaddr_in addresslisten;
+	struct event accept_event;
+	int reuse = 1;
+
+	event_init();
+
+	socketlisten = socket(AF_INET, SOCK_STREAM, 0);
+
+	if(socketlisten < 0) {
+		fprintf(stderr, "Failed to create listen socket");
+		return 1;
+	}
+
+	memset(&addresslisten, 0, sizeof(addresslisten));
+
+	addresslisten.sin_family = AF_INET;
+	addresslisten.sin_addr.s_addr = INADDR_ANY;
+	addresslisten.sin_port = htons(25000);
+
+	if(bind(socketlisten, (struct sockaddr *)&addresslisten, sizeof(addresslisten)) < 0) {
+		fprintf(stderr, "Failed to bind");
+		return 1;
+	}
+
+	if(listen(socketlisten, 5) < 0) {
+		fprintf(stderr, "Failed to listen to socket");
+		return 1;
+	}
+
+	setsockopt(socketlisten, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
+
+	setnonblock(socketlisten);
+
+	event_set(&accept_event, socketlisten, EV_READ|EV_PERSIST, accept_callback, NULL);
+
+	event_add(&accept_event, NULL);
+
+	event_dispatch();
+
+	close(socketlisten);
+
+	return 0;
+}

src/sim.c

@@ -13,133 +13,15 @@
 #include <unistd.h>
 
 #include "include/sim.h"
-#include "include/init.h"
+#include "include/server.h"
 #include "include/world.h"
 #include "include/robot.h"
 
-int initEventServer(void);
-struct client;
-int setnonblock(int fd);
-void buf_read_callback(struct bufferevent *incoming, void *arg);
-void buf_write_callback(struct bufferevent *bev, void *arg);
-void buf_error_callback(struct bufferevent *bev, short what, void *arg);
-void accept_callback(int fd, short ev, void *arg);
-
-
 int main(int argc, char **argv) {
 	initGlut(&argc, argv);
-	//initServer(&argc, argv);
-	initEventServer();
+	initServer(&argc, argv);
 
 	glutMainLoop();	// Loop forever
 	return 0;
 }
 
-struct client {
-	int fd;
-	struct bufferevent *buf_ev;
-};
-
-int setnonblock(int fd) {
-	int flags;
-
-	flags = fcntl(fd, F_GETFL);
-	flags |= O_NONBLOCK;
-	fcntl(fd, F_SETFL, flags);
-}
-
-void buf_read_callback(struct bufferevent *incoming, void *arg) {
-	struct evbuffer *evreturn;
-	char *req;
-
-	req = evbuffer_readline(incoming->input);
-	if(req == NULL)
-		return;
-
-	evreturn = evbuffer_new();
-	evbuffer_add_printf(evreturn, "You said %s\n", req);
-	bufferevent_write_buffer(incoming, evreturn);
-	evbuffer_free(evreturn);
-	free(req);
-}
-
-void buf_write_callback(struct bufferevent *bev, void *arg) {
-
-}
-
-void buf_error_callback(struct bufferevent *bev, short what, void *arg) {
-	struct client *client = (struct client *)arg;
-	bufferevent_free(client->buf_ev);
-	close(client->fd);
-	free(client);
-}
-
-void accept_callback(int fd, short ev, void *arg) {
-	int client_fd;
-	struct sockaddr_in client_addr;
-	socklen_t client_len = sizeof(client_addr);
-	struct client *client;
-
-	client_fd = accept(fd, (struct sockaddr *)&client_addr, &client_len);
-	if(client_fd < 0) {
-		warn("Client: accept() failed");
-		return;
-	}
-
-	setnonblock(client_fd);
-
-	client = calloc(1, sizeof(*client));
-	if(client == NULL)
-		err(1, "malloc failed");
-	client->fd = client_fd;
-
-	client->buf_ev = bufferevent_new(client_fd, buf_read_callback, buf_write_callback, buf_error_callback, client);
-	bufferevent_enable(client->buf_ev, EV_READ);
-}
-
-int initEventServer(void) {
-	int socketlisten;
-	struct sockaddr_in addresslisten;
-	struct event accept_event;
-	int reuse = 1;
-
-	event_init();
-
-	socketlisten = socket(AF_INET, SOCK_STREAM, 0);
-
-	if(socketlisten < 0) {
-		fprintf(stderr, "Failed to create listen socket");
-		return 1;
-	}
-
-	memset(&addresslisten, 0, sizeof(addresslisten));
-
-	addresslisten.sin_family = AF_INET;
-	addresslisten.sin_addr.s_addr = INADDR_ANY;
-	addresslisten.sin_port = htons(25000);
-
-	if(bind(socketlisten, (struct sockaddr *)&addresslisten, sizeof(addresslisten)) < 0) {
-		fprintf(stderr, "Failed to bind");
-		return 1;
-	}
-
-	if(listen(socketlisten, 5) < 0) {
-		fprintf(stderr, "Failed to listen to socket");
-		return 1;
-	}
-
-	setsockopt(socketlisten, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(reuse));
-
-	setnonblock(socketlisten);
-
-	event_set(&accept_event, socketlisten, EV_READ|EV_PERSIST, accept_callback, NULL);
-
-	event_add(&accept_event, NULL);
-
-	event_dispatch();
-
-	close(socketlisten);
-
-	return 0;
-}
-