From 1969f22958180126e2a908294cfd3844bc49ad06 Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI
Date: Mon, 19 Sep 2016 17:10:11 +0200
Subject: [PATCH 1/3] Makefile pour le pongd
---
pingpong/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pingpong/Makefile b/pingpong/Makefile
index 17b1352..d0864dc 100644
--- a/pingpong/Makefile
+++ b/pingpong/Makefile
@@ -10,7 +10,7 @@ TESTS=$(addsuffix .test, $(EXEC))
all: $(SOURCES) $(EXEC)
$(EXEC): $(OBJECTS) $(CFILES)
- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $@.c -o $@.bin
+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $@.c -lcbor -o $@.bin
.c.o:
$(CC) -c $(CFLAGS) $< -o $@
From e53e37b9155823795ab92449f22d353765a7cd97 Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI
Date: Mon, 19 Sep 2016 17:38:52 +0200
Subject: [PATCH 2/3] pubsub: wrong pointer
---
lib/pubsub.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/pubsub.c b/lib/pubsub.c
index 42fc559..69e9c36 100644
--- a/lib/pubsub.c
+++ b/lib/pubsub.c
@@ -49,7 +49,7 @@ void pubsubd_msg_unserialize (struct pubsub_msg *msg, const char *buf, size_t ml
cbor_item_t * item = cbor_load ((unsigned char *) buf, mlen, &result);
struct cbor_pair * pair = cbor_map_handle (item);
- cbor_mutable_data *data = cbor_bytestring_handle (pair->value);
+ cbor_mutable_data data = cbor_bytestring_handle (pair->value);
msg->type = cbor_get_uint8 (pair->key);
if (msg->type != PUBSUB_TYPE_DISCONNECT) {
From 6f72bce61cb98e7af93c20bb34a599ad089b9b52 Mon Sep 17 00:00:00 2001
From: Philippe PITTOLI
Date: Mon, 19 Sep 2016 17:44:06 +0200
Subject: [PATCH 3/3] pubsubd: reorganize
---
pubsub/{ => app}/Makefile | 2 +-
pubsub/{ => app}/msg-serialize.c | 0
pubsub/{ => app}/msg-unserialize.c | 0
pubsub/{ => app}/pubsub-test-send-params.c | 0
pubsub/{ => app}/pubsub-test-send.c | 0
pubsub/{ => app}/pubsubc.c | 0
pubsub/{ => app}/pubsubd.c | 0
pubsub/{ => app}/test-chan-lists.c | 0
pubsub/{ => app}/test-gen-new-process.c | 0
pubsub/{ => app}/test-gen-new-process.sh | 0
pubsub/{ => app}/test-pipe-read.c | 0
pubsub/{ => app}/test-pipe-write.c | 0
pubsub/{ => app}/test-subscribers.c | 0
pubsub/{ => app}/test-test-send-params.sh | 0
{lib => pubsub/lib}/pubsubd.c | 0
{lib => pubsub/lib}/pubsubd.h | 2 +-
16 files changed, 2 insertions(+), 2 deletions(-)
rename pubsub/{ => app}/Makefile (92%)
rename pubsub/{ => app}/msg-serialize.c (100%)
rename pubsub/{ => app}/msg-unserialize.c (100%)
rename pubsub/{ => app}/pubsub-test-send-params.c (100%)
rename pubsub/{ => app}/pubsub-test-send.c (100%)
rename pubsub/{ => app}/pubsubc.c (100%)
rename pubsub/{ => app}/pubsubd.c (100%)
rename pubsub/{ => app}/test-chan-lists.c (100%)
rename pubsub/{ => app}/test-gen-new-process.c (100%)
rename pubsub/{ => app}/test-gen-new-process.sh (100%)
rename pubsub/{ => app}/test-pipe-read.c (100%)
rename pubsub/{ => app}/test-pipe-write.c (100%)
rename pubsub/{ => app}/test-subscribers.c (100%)
rename pubsub/{ => app}/test-test-send-params.sh (100%)
rename {lib => pubsub/lib}/pubsubd.c (100%)
rename {lib => pubsub/lib}/pubsubd.h (99%)
diff --git a/pubsub/Makefile b/pubsub/app/Makefile
similarity index 92%
rename from pubsub/Makefile
rename to pubsub/app/Makefile
index 4da897d..f6276d4 100644
--- a/pubsub/Makefile
+++ b/pubsub/app/Makefile
@@ -3,7 +3,7 @@ CFLAGS=-Wall -g -Wextra
LDFLAGS= -pthread
CFILES=$(wildcard *.c) # CFILES => recompiles everything on a C file change
EXEC=$(basename $(wildcard *.c))
-SOURCES=$(wildcard ../lib/*.c)
+SOURCES=$(wildcard ../lib/*.c ../../lib/*.c)
OBJECTS=$(SOURCES:.c=.o)
TESTS=$(addsuffix .test, $(EXEC))
diff --git a/pubsub/msg-serialize.c b/pubsub/app/msg-serialize.c
similarity index 100%
rename from pubsub/msg-serialize.c
rename to pubsub/app/msg-serialize.c
diff --git a/pubsub/msg-unserialize.c b/pubsub/app/msg-unserialize.c
similarity index 100%
rename from pubsub/msg-unserialize.c
rename to pubsub/app/msg-unserialize.c
diff --git a/pubsub/pubsub-test-send-params.c b/pubsub/app/pubsub-test-send-params.c
similarity index 100%
rename from pubsub/pubsub-test-send-params.c
rename to pubsub/app/pubsub-test-send-params.c
diff --git a/pubsub/pubsub-test-send.c b/pubsub/app/pubsub-test-send.c
similarity index 100%
rename from pubsub/pubsub-test-send.c
rename to pubsub/app/pubsub-test-send.c
diff --git a/pubsub/pubsubc.c b/pubsub/app/pubsubc.c
similarity index 100%
rename from pubsub/pubsubc.c
rename to pubsub/app/pubsubc.c
diff --git a/pubsub/pubsubd.c b/pubsub/app/pubsubd.c
similarity index 100%
rename from pubsub/pubsubd.c
rename to pubsub/app/pubsubd.c
diff --git a/pubsub/test-chan-lists.c b/pubsub/app/test-chan-lists.c
similarity index 100%
rename from pubsub/test-chan-lists.c
rename to pubsub/app/test-chan-lists.c
diff --git a/pubsub/test-gen-new-process.c b/pubsub/app/test-gen-new-process.c
similarity index 100%
rename from pubsub/test-gen-new-process.c
rename to pubsub/app/test-gen-new-process.c
diff --git a/pubsub/test-gen-new-process.sh b/pubsub/app/test-gen-new-process.sh
similarity index 100%
rename from pubsub/test-gen-new-process.sh
rename to pubsub/app/test-gen-new-process.sh
diff --git a/pubsub/test-pipe-read.c b/pubsub/app/test-pipe-read.c
similarity index 100%
rename from pubsub/test-pipe-read.c
rename to pubsub/app/test-pipe-read.c
diff --git a/pubsub/test-pipe-write.c b/pubsub/app/test-pipe-write.c
similarity index 100%
rename from pubsub/test-pipe-write.c
rename to pubsub/app/test-pipe-write.c
diff --git a/pubsub/test-subscribers.c b/pubsub/app/test-subscribers.c
similarity index 100%
rename from pubsub/test-subscribers.c
rename to pubsub/app/test-subscribers.c
diff --git a/pubsub/test-test-send-params.sh b/pubsub/app/test-test-send-params.sh
similarity index 100%
rename from pubsub/test-test-send-params.sh
rename to pubsub/app/test-test-send-params.sh
diff --git a/lib/pubsubd.c b/pubsub/lib/pubsubd.c
similarity index 100%
rename from lib/pubsubd.c
rename to pubsub/lib/pubsubd.c
diff --git a/lib/pubsubd.h b/pubsub/lib/pubsubd.h
similarity index 99%
rename from lib/pubsubd.h
rename to pubsub/lib/pubsubd.h
index fad9cd5..0bd9d6f 100644
--- a/lib/pubsubd.h
+++ b/pubsub/lib/pubsubd.h
@@ -1,7 +1,7 @@
#ifndef __PUBSUBD_H__
#define __PUBSUBD_H__
-#include "pubsub.h"
+#include "../../lib/pubsub.h"
#include
struct channel;