Fixed compilation problems.

diff --git a/fwp/config.target b/fwp/config.target
new file mode 100644 (file)
index 0000000..30b3e2c
--- /dev/null
+++ b/fwp/config.target
@@ -0,0 +1,2 @@
+USE_LEAF_MAKEFILES=n
+LN_HEADERS=y
\ No newline at end of file

diff --git a/fwp/libfwp/include/fwp_ctable.h b/fwp/libfwp/include/fwp_ctable.h
index 1c810723e2e04d6b8c22b2ad25724db6e59c85de..4db70d7733f3b8790bdc5791b4b37433b3d43b54 100644 (file)
--- a/fwp/libfwp/include/fwp_ctable.h
+++ b/fwp/libfwp/include/fwp_ctable.h
@@ -26,7 +26,7 @@ struct fwp_ctable {
 
 void fwp_ctable_init(struct fwp_ctable *ctable);
 int fwp_ctable_put(struct fwp_ctable *ctable, struct fwp_ctable_entry *entry);
-int fwp_ctable_get(struct fwp_ctable *ctable, struct fwp_ctable_entry *entry);
+struct fwp_ctable_entry* fwp_ctable_get(struct fwp_ctable* ctable, unsigned int id);
 void fwp_ctable_remove(struct fwp_ctable *ctable, unsigned int id);
 
 #endif /* _FWP_CTABLE_H */ 

diff --git a/fwp/libfwp/src/fwp_proto.c b/fwp/libfwp/src/fwp_proto.c
index 81d86c4a741f521470e4ee3a3d90db6701c29e2e..fda5a47618cf201b8edec37d2d8492b063a70933 100644 (file)
--- a/fwp/libfwp/src/fwp_proto.c
+++ b/fwp/libfwp/src/fwp_proto.c
@@ -102,7 +102,7 @@ int fwp_contract_negotiate (struct fwp_contract *contract)
        
        if (msgb == NULL) return -1;
        
-       fwp_msg_header_put(msgb, NEGOTIATE_REQUEST, 0);
+       fwp_msg_header_put(msgb, FWP_NEGT_REQ, 0);
        fwp_msg_contract_put(msgb, contract);
        
        /*sendto FWP client through unix socket