[hipl-commit] [trunk] Rev 4031: Reverted patch 4024 and moved userspace ipsec back to firewall.
- From: Miika Komu <miika@xxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Fri, 19 Mar 2010 09:12:15 +0200
Committer: Miika Komu <miika@xxxxxx>
Date: 19/03/2010 at 09:12:15
Revision: 4031
Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Reverted patch 4024 and moved userspace ipsec back to firewall.
because this brought a number of problems with --enable-shared
and the dependencies would probably require a separate library.
I wrote down to doc/COPYING that an imported component is
located at the firewall.
Modified:
R lib/tool/user_ipsec_esp.c => firewall/user_ipsec_esp.c
R lib/tool/user_ipsec_esp.h => firewall/user_ipsec_esp.h
M Makefile.am
M doc/COPYING
M firewall/datapkt.c
M firewall/user_ipsec_api.c
=== modified file 'Makefile.am'
--- Makefile.am 2010-03-18 19:16:17 +0000
+++ Makefile.am 2010-03-19 07:12:39 +0000
@@ -207,7 +207,8 @@
firewall/sysopp.c \
firewall/cache.c \
firewall/cache_port.c \
- firewall/datapkt.c
+ firewall/datapkt.c \
+ firewall/user_ipsec_esp.c
if HIP_MIDAUTH
firewall_hipfw_SOURCES += firewall/midauth.c \
@@ -269,8 +270,7 @@
lib_tool_libhiptool_la_SOURCES = lib/tool/pk.c \
lib/tool/nlink.c \
lib/tool/lutil.c \
- lib/tool/checksum.c \
- lib/tool/user_ipsec_esp.c
+ lib/tool/checksum.c
############################ NOTE ##################################
#
=== modified file 'doc/COPYING'
--- doc/COPYING 2010-03-18 22:21:16 +0000
+++ doc/COPYING 2010-03-19 07:12:39 +0000
@@ -1,10 +1,11 @@
HIPL Licensing Conditions
=========================
-HIPL is licensed under GPLv2 until June 2010. After this, the code
-developed for the HIPL project will change to MIT (Expat
-license). However, the following companies can use the code developed
-for HIPL project earlier using the MIT license:
+HIPL is licensed under GPLv2 until June 2010. After this, the license
+for the code developed for the HIPL project will change from GPLv2 to
+MIT (Expat license). However, the following companies can use the code
+developed for the HIPL project using the MIT license already before the
+mentioned date:
* Nokia OYJ
* OY LM Ericsson Ab
@@ -16,28 +17,29 @@
The code under the following directories was developed for the HIPL project:
- * test
- * agent
- * hipd
- * firewall
+ * firewall (see an exception below)
* tools (see exceptions below)
+ * lib/performance
* lib/opphip
- * lib/performance
* lib/conf
* lib/gui
* lib/core
+ * test
+ * agent
+ * hipd
* doc
The following directories contain code imported from other projects
and have their own licensing conditions:
- * i3
+ * firewall/user_ipsec_esp.c
* tools/daemontools
* tools/djbdns
* tools/DNS
* lib/android
* lib/tool
* lib/ipsec
+ * i3
MIT (Expat) License
===================
=== modified file 'firewall/datapkt.c'
--- firewall/datapkt.c 2010-03-18 21:15:21 +0000
+++ firewall/datapkt.c 2010-03-19 07:12:39 +0000
@@ -32,7 +32,7 @@
#include "config.h"
#include "datapkt.h"
#include "user_ipsec_api.h"
-#include "lib/tool/user_ipsec_esp.h"
+#include "user_ipsec_esp.h"
#include "cache.h"
#include "lib/core/debug.h"
#include "lib/core/ife.h"
=== modified file 'firewall/user_ipsec_api.c'
--- firewall/user_ipsec_api.c 2010-03-18 21:15:21 +0000
+++ firewall/user_ipsec_api.c 2010-03-19 07:12:39 +0000
@@ -16,7 +16,7 @@
#include "user_ipsec_api.h"
#include "user_ipsec_sadb.h"
-#include "lib/tool/user_ipsec_esp.h"
+#include "user_ipsec_esp.h"
#include "user_ipsec_fw_msg.h"
#include "esp_prot_api.h"
#include "lib/core/ife.h"
Other related posts:
- » [hipl-commit] [trunk] Rev 4031: Reverted patch 4024 and moved userspace ipsec back to firewall. - Miika Komu
