Merge pull request #4 from tempodb/posix_sockets

Posix sockets

Author: myagley

.gitignore

@@ -1,11 +1,10 @@
-tempodb_tests
-tempodb_tests.txt
-lib/libtempodb.a
-lib/test/libtempodb.a
+*tempodb_tests
+*tempodb_tests.txt
+lib/*.a
+lib/test/*.a
 objs/*
 a.out
 examples/example-authed.c
 CppUTest/CppUTest_tests
-CppUTest/lib/libCppUTest.a
-CppUTest/lib/libCppUTestExt.a
+CppUTest/lib/*.a
 CppUTest/objs

CppUTest/build/MakefileWorker.mk

@@ -192,7 +192,7 @@ OBJ = $(call src_to_o,$(SRC))
 
 STUFF_TO_CLEAN += $(OBJ)
 
-TEST_SRC = $(call get_src_from_dir_list, $(TEST_SRC_DIRS))
+TEST_SRC = $(call get_src_from_dir_list, $(TEST_SRC_DIRS)) $(TEST_SRC_FILES)
 TEST_OBJS = $(call src_to_o,$(TEST_SRC))
 STUFF_TO_CLEAN += $(TEST_OBJS)
 
@@ -287,10 +287,10 @@ $(TARGET_LIB): $(OBJ)
 	$(SILENCE)$(AR) $(ARFLAGS) $@ $^
 	$(SILENCE)ranlib $@
 
-test: $(TEST_TARGET)
+test_platform: $(TEST_TARGET)
 	$(RUN_TEST_TARGET)
 
-vtest: $(TEST_TARGET)
+vtest_platform: $(TEST_TARGET)
 	$(RUN_TEST_TARGET) -v
 
 $(CPPUTEST_OBJS_DIR)/%.o: %.cpp

Makefile

@@ -3,54 +3,74 @@
 #Set this to @ to keep the makefile quiet
 SILENCE = @
 
-#---- Outputs ----#
-COMPONENT_NAME = tempodb
+ifdef PLATFORM
+	COMPONENT_NAME = $(PLATFORM)_tempodb
+	SRC_FILES = src/tempodb/platform/$(PLATFORM).c
+	TEST_SRC_FILES = tests/TempoDb/platform/$(PLATFORM)_test.c
+	MOCKS_SRC_DIRS = mocks/$(PLATFORM)
+else
+  COMPONENT_NAME = tempodb
+	TEST_SRC_FILES = tests/TempoDb/tempodb_test.c
+	MOCKS_SRC_DIRS = mocks
+endif
 
 #--- Inputs ----#
 CPPUTEST_HOME = CppUTest
 CPP_PLATFORM = Gcc
 PROJECT_HOME_DIR = .
 
-SRC_DIRS = \
+SRC_DIRS += \
 	src/tempodb
 
-TEST_SRC_DIRS = \
+TEST_SRC_DIRS += \
 	.\
-	mocks\
-	tests/TempoDb\
-	tests\
-
+	tests
 
 INCLUDE_DIRS =\
   .\
   $(CPPUTEST_HOME)/include\
   mocks\
 	include/tempodb
 
-MOCKS_SRC_DIRS = \
-	mocks\
-
 CPPUTEST_WARNINGFLAGS = -Wall -Wswitch-default -Werror
 #CPPUTEST_CFLAGS = -std=c89
 CPPUTEST_CFLAGS += -Wall -Wstrict-prototypes -pedantic
 LD_LIBRARIES = -lpthread
 
-STUFF_TO_CLEAN += objs/* objs/src/tempodb/* objs/tests/* objs/mocks/* objs/tests/tempodb/* lib/libtempodb.a
+STUFF_TO_CLEAN += objs/*.o objs/platform/*.o objs/src/tempodb/* objs/tests/* objs/mocks/* objs/tests/tempodb/* lib/libtempodb*.a *tempodb_tests
 
 CC = cc
 
-all: lib/libtempodb.a
+all: posix
 
-lib/libtempodb.a: objs/base64.o objs/tempodb.o
-	ar rv lib/libtempodb.a objs/base64.o objs/tempodb.o
+posix: lib/libtempodb_posix.a
+
+lib/libtempodb_posix.a: objs/base64.o objs/tempodb.o objs/platform/posix.o
+	ar rv lib/libtempodb_posix.a objs/base64.o objs/tempodb.o objs/platform/posix.o
 
 objs/base64.o:
 	$(CC) -c -I include/tempodb -o objs/base64.o src/tempodb/base64.c
 
 objs/tempodb.o:
 	$(CC) -c -I include/tempodb -o objs/tempodb.o src/tempodb/tempodb.c
 
+objs/platform/posix.o:
+	$(CC) -c -I include/tempodb -o objs/platform/posix.o src/tempodb/platform/posix.c
+
 CppUTest/lib/libCppUTest.a:
 	cd CppUTest && make lib/libCppUTest.a
 
+vtest_posix:
+	$(SILENCE)echo ">>> Running Posix Tests"
+	$(SILENCE)PLATFORM="posix" make vtest_platform
+	$(SILENCE)echo "<<< Finished Posix Tests"
+
+vtest_common:
+	$(SILENCE)echo ">>> Running TempoDB Tests"
+	$(SILENCE)make vtest_platform
+	$(SILENCE)echo "<<< Finished TempoDB Tests"
+
+
+vtest: vtest_common vtest_posix
+
 include $(CPPUTEST_HOME)/build/MakefileWorker.mk

include/tempodb/tempodb.h

@@ -10,16 +10,23 @@
 #define TEMPODB_POST "POST"
 
 typedef struct tempodb_config tempodb_config;
+typedef struct tempodb_platform_config tempodb_platform_config;
 typedef struct tempodb_bulk_update tempodb_bulk_update;
 
 enum id_or_key {TEMPODB_ID, TEMPODB_KEY};
 
-struct tempodb_bulk_update{
+struct tempodb_bulk_update {
   const char *series;
   enum id_or_key type;
   float value;
 };
 
+/* defined by platform-specific files */
+tempodb_platform_config * tempodb_platform_create(void);
+int tempodb_platform_destroy(tempodb_platform_config *config);
+int tempodb_platform_send(tempodb_platform_config *config, const char *command);
+int tempodb_platform_read_response(tempodb_platform_config *config, char *buffer, const int buffer_size);
+
 tempodb_config * tempodb_create(const char *key, const char *secret);
 void tempodb_destroy(tempodb_config *config);
 

mocks/platform_mock.c

@@ -0,0 +1,45 @@
+#include "platform_mock.h"
+
+static size_t response_buffer_size = 1024;
+char *response_buffer;
+
+void test_init(void) {
+  last_request = malloc(1);
+  response_buffer = malloc(response_buffer_size + 1);
+  memset(response_buffer, 0, response_buffer_size + 1);
+  set_test_response("200 OK");
+}
+
+void test_cleanup(void) {
+  free(last_request);
+  free(response_buffer);
+}
+
+tempodb_platform_config * tempodb_platform_create(void) {
+  return malloc(1);
+}
+
+int tempodb_platform_destroy(tempodb_platform_config *config) {
+  free(config);
+  return 0;
+}
+
+int tempodb_platform_send(tempodb_platform_config *config, const char *command) {
+  free(last_request);
+  last_request = malloc(strlen(command) + 1);
+  strncpy(last_request, command, strlen(command));
+  return 0;
+}
+
+int tempodb_platform_read_response(tempodb_platform_config *config, char *buffer, const int buffer_size) {
+  int response_size = response_buffer_size;
+  if (buffer_size < response_buffer_size) {
+    response_size = buffer_size;
+  }
+  strncpy(buffer, response_buffer, response_size);
+  return 0;
+}
+
+void set_test_response(const char *buffer) {
+  strncpy(response_buffer, buffer, response_buffer_size);
+}

mocks/platform_mock.h

@@ -0,0 +1,14 @@
+#ifndef TEMPODB_PLATFORM_MOCK_H
+#define TEMPODB_PLATFORM_MOCK_H
+
+#include <string.h>
+#include "tempodb.h"
+
+char *last_request;
+
+void test_init(void);
+void test_cleanup(void);
+
+void set_test_response(const char *buffer);
+
+#endif

mocks/TCPSocketStub.c renamed to mocks/posix/posix_mock.c

@@ -1,4 +1,4 @@
-#include "TCPSocketStub.h"
+#include "posix_mock.h"
 #include <stdio.h>
 
 static struct hostent *hent;
@@ -10,7 +10,6 @@ static size_t response_buffer_bytes_sent;
 char *response_buffer;
 char *response_buffer_remaining;
 
-
 static int last_request_size = 1024;
 
 int socket(int domain, int type, int protocol) {

mocks/TCPSocketStub.h renamed to mocks/posix/posix_mock.h

@@ -1,5 +1,5 @@
-#ifndef TCPSocketStub_H
-#define TCPSocketStub_H
+#ifndef TEMPODB_PLATFORM_POSIX_MOCK_H
+#define TEMPODB_PLATFORM_POSIX_MOCK_H
 
 #include <arpa/inet.h>
 #include <netdb.h>

src/tempodb/base64.c

@@ -60,7 +60,7 @@ char *encode_base64(int size, unsigned char *src) {
   if(!size)
     size= strlen((char *)src);
 
-  out= malloc(sizeof(char) * size*4/3+4);
+  out= malloc(sizeof(char) * size*4/3+4 + 1);
 
   p= out;
 
@@ -97,6 +97,7 @@ char *encode_base64(int size, unsigned char *src) {
     }
 
   }
+  *p++ = '\0';
 
   return out;
 

src/tempodb/platform/posix.c

@@ -0,0 +1,116 @@
+#include "tempodb.h"
+#include <sys/socket.h>
+#include <stdio.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+
+static int tempodb_create_socket(void);
+static struct sockaddr_in * tempodb_addr(void);
+static char * tempodb_getip(char *host);
+
+struct tempodb_platform_config {
+  int sock;
+};
+
+tempodb_platform_config * tempodb_platform_create(void) {
+  tempodb_platform_config *config = (tempodb_platform_config *)malloc(sizeof(tempodb_platform_config));
+  config->sock = tempodb_create_socket();
+  return config;
+}
+
+int tempodb_platform_destroy(tempodb_platform_config *config)
+{
+  free(config);
+  return 0;
+}
+
+int tempodb_platform_read_response(tempodb_platform_config *config, char *buffer, const int buffer_size) {
+  size_t bytes_read = 0;
+  size_t bytes_read_part;
+  int status = 0;
+
+  size_t remaining_buffer_size = buffer_size - 1;
+  char *remaining_buffer = buffer;
+
+  memset(buffer, 0, buffer_size);
+
+  while ((bytes_read_part = recv(config->sock, remaining_buffer, remaining_buffer_size, 0)) > 0) {
+    if (bytes_read_part == -1) {
+      status = -1;
+      perror("Can't read from socket");
+    }
+    bytes_read += bytes_read_part;
+    remaining_buffer_size -= bytes_read_part;
+    remaining_buffer += bytes_read_part;
+  }
+  return status;
+}
+
+int tempodb_platform_send(tempodb_platform_config *config, const char *query) {
+  int sent = 0;
+  int sent_part;
+
+  while (sent < strlen(query)) {
+    sent_part = send(config->sock, query + sent, strlen(query) - sent, 0);
+    if (sent_part == -1) {
+      perror("Can't send query");
+      return -1;
+    }
+    sent += sent_part;
+  }
+  return 0;
+}
+
+static int tempodb_create_socket(void) {
+  struct sockaddr_in *addr = tempodb_addr();
+  int sock;
+  if((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) < 0){
+    perror("Can't create TCP socket");
+    exit(1);
+  }
+  if(connect(sock, (struct sockaddr *)addr, sizeof(struct sockaddr)) < 0){
+    perror("Could not connect");
+    exit(1);
+  }
+  free(addr);
+  return sock;
+}
+
+static struct sockaddr_in * tempodb_addr(void) {
+  struct sockaddr_in *remote;
+  char *ip = tempodb_getip(DOMAIN);
+
+  remote = (struct sockaddr_in *)malloc(sizeof(struct sockaddr_in));
+  remote->sin_family = AF_INET;
+  remote->sin_port = htons(80);
+  remote->sin_addr.s_addr = inet_addr(ip);
+
+  if (remote->sin_addr.s_addr == INADDR_NONE) {
+    fprintf(stderr, "%s is not a valid IP address\n", ip);
+    exit(1);
+  }
+
+  free(ip);
+  return remote;
+}
+
+static char * tempodb_getip(char *host)
+{
+  struct hostent *hent;
+  int iplen = 16;
+  char *ip = (char *)malloc(iplen+1);
+  memset(ip, 0, iplen+1);
+  if((hent = gethostbyname(host)) == NULL)
+  {
+    herror("Can't get IP");
+    exit(1);
+  }
+  if(inet_ntop(AF_INET, (void *)hent->h_addr_list[0], ip, iplen) == NULL)
+  {
+    perror("Can't resolve host");
+    exit(1);
+  }
+  return ip;
+}
+