Merge authors:
Christof Mroz (christof-mroz)
------------------------------------------------------------
revno: 4921 [merge]
committer: Rene Hummen <[email protected]>
branch nick: ipsec_esp
timestamp: Mon 2010-09-06 19:16:19 +0200
message:
merged to trunk revision 4926
modified:
firewall/conntrack.c
modules/heartbeat/hipd/heartbeat.c
--
lp:~rene-hummen/hipl/ipsec_esp
https://code.launchpad.net/~rene-hummen/hipl/ipsec_esp
Your team HIPL core team is subscribed to branch lp:~rene-hummen/hipl/ipsec_esp.
To unsubscribe from this branch go to
https://code.launchpad.net/~rene-hummen/hipl/ipsec_esp/+edit-subscription
=== modified file 'firewall/conntrack.c'
--- firewall/conntrack.c 2010-08-20 16:38:55 +0000
+++ firewall/conntrack.c 2010-09-06 11:51:23 +0000
@@ -580,16 +580,16 @@
tuple->connection = NULL;
// tuple was not malloced -> no free here
- }
-
- if (tuple->src_ip) {
- free(tuple->src_ip);
- tuple->src_ip = NULL;
- }
-
- if (tuple->dst_ip) {
- free(tuple->dst_ip);
- tuple->dst_ip = NULL;
+
+ if (tuple->src_ip) {
+ free(tuple->src_ip);
+ tuple->src_ip = NULL;
+ }
+
+ if (tuple->dst_ip) {
+ free(tuple->dst_ip);
+ tuple->dst_ip = NULL;
+ }
}
}
=== modified file 'modules/heartbeat/hipd/heartbeat.c'
--- modules/heartbeat/hipd/heartbeat.c 2010-09-06 17:06:39 +0000
+++ modules/heartbeat/hipd/heartbeat.c 2010-09-06 17:16:19 +0000
@@ -438,6 +438,8 @@
-1,
"Error on allocating memory for heartbeat_counter.\n");
+ *heartbeat_count = 0;
+
err = lmod_add_state_item(state, heartbeat_count, "heartbeat_update");
out_err:
_______________________________________________
Mailing list: https://launchpad.net/~hipl-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~hipl-core
More help : https://help.launchpad.net/ListHelp
