Añadiendo script para obtener el .o con la información de las estruct…

…uras de worm

añadiendo obj/ al gitignore
Cambio de nombre a Makefile

.gitignore

@@ -3,6 +3,7 @@
 *.ko
 *.obj
 *.elf
+obj/
 
 *.orig
 
@@ -146,4 +147,4 @@ target/
 GPATH
 GRTAGS
 GTAGS
-GSYMS
+GSYMS

Makefile

@@ -0,0 +1,43 @@
+export CC=gcc
+export CXX=g++
+export FLAGS=-I include/ -Wall -Werror
+export CFLAGS=$(FLAGS) -std=c99 -fPIC
+export CXXFLAGS=$(FLAGS) -std=c++11
+export LDFLAGS=-fPIC
+
+INCLUDES := $(wildcard include/*.h include/*.hpp)
+
+
+all: einstein libs
+
+einstein: obj/einstein.o
+
+lib/libworm.so: obj/worm.o obj/common.o obj/structures.h.o
+	$(CC) $(CFLAGS) -shared -o $@ $^  $(LDFLAGS)
+
+obj:
+	mkdir -p obj
+
+libs: lib lib/libworm.so
+
+lib:
+	mkdir -p lib
+
+buildTools:
+	$(MAKE) -C tools
+
+obj/%.o: src/%.cpp obj $(INCLUDES)
+	$(CXX) $(CXXFLAGS) -c $< -o $@
+
+obj/%.o: src/%.c obj $(INCLUDES)
+	$(CC) $(CFLAGS) -c $< -o $@
+
+
+clean:
+	rm -rf obj lib
+
+
+#Custom Data .o
+obj/structures.h.o: $(INCLUDES)
+	./tools/parseFile.bash > obj/structures.h
+	objcopy --input binary --output elf64-x86-64 --binary-architecture i386 obj/structures.h $@

include/worm_private.h

@@ -85,12 +85,31 @@ extern "C" {
 	 */
 	uint8_t WH_DymRoute_init (const uint8_t * const routeDescription, DestinationWorms** cns);
 
+
+	/* Name WH_DymRoute_init
+	 * Starts the Dynamic Routing Library, and setups connection configuration.
+	 * Also makes connections
+	 * Return 0 if OK, something else if error.
+	 */
+	uint8_t WH_DymRoute_route_create (FILE* f, const uint8_t * const routeDescription, DestinationWorms** cns);
+	/* Name WH_DymRoute_init
+	 * Starts the Dynamic Routing Library, and setups connection configuration.
+	 * Also makes connections
+	 * Return 0 if OK, something else if error.
+	 */
+	uint8_t WH_DymRoute_route_createFunc (FILE* f, const uint8_t * const routeDescription, DestinationWorms** cns);
+
 	/* Name WH_DymRoute_route
 	 * Enrute a message
 	 * Return the number of msgs sent
 	 */
 	uint8_t WH_DymRoute_route (const MessageInfo * const mi, DestinationWorms* const cns);
 
+	/* Name WH_DymRoute_precompiled_route
+	 * Enrute a message
+	 * Return the number of msgs sent
+	 */
+	uint8_t (*WH_DymRoute_precompiled_route) (const MessageInfo * const mi, DestinationWorms* const cns);
 
 	/* Name WH_DymRoute_send
 	 * Sends a message to the network

tools/Makefile

@@ -0,0 +1,4 @@
+all:
+
+clean:
+	#rm -rf

tools/cStructureExtract.c

@@ -0,0 +1,9 @@
+#include <stdio.h>
+
+
+int main()
+{
+
+
+	return 0;
+}

tools/parseFile.bash

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+FILES=$(ls include/*.h)
+
+
+for f in $FILES
+do
+	flag=0
+
+	cat $f | while read in
+	do
+
+		if [[ flag -eq 0 ]]
+		then
+
+			if [[ $in == *"struct"* || $in == *"enum"* ]]
+			then
+				echo "${in}"
+				flag=1
+			fi
+		else
+                        echo "${in}"
+		fi
+
+
+                if [[ $in == *"}"* ]]
+                then
+                        flag=0
+                fi
+
+	done
+
+done