[hipl-commit] [release-1.0.5] Rev 3799: Syncronized to trunk revisions 3815..3817

  • From: Miika Komu <miika@xxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Fri, 19 Mar 2010 11:25:27 +0200

Committer: Miika Komu <miika@xxxxxx>
Date: 19/03/2010 at 11:25:27
Revision: 3799
Revision-id: miika@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: release-1.0.5

Log:
  Syncronized to trunk revisions 3815..3817

Modified:
  M  agent/connhipd.c
  M  hipd/update.c
  M  lib/core/icomm.h
  M  lib/core/ife.h

=== modified file 'agent/connhipd.c'
--- agent/connhipd.c    2010-03-03 13:16:18 +0000
+++ agent/connhipd.c    2010-03-19 09:25:52 +0000
@@ -133,7 +133,7 @@
     } else if (type == SO_HIP_SET_NAT_ON)   {
         gui_update_nat(1);
         HIP_DEBUG("NAT extensions on.\n");
-    } else if (type == SO_HIP_SET_NAT_OFF)   {
+    } else if (type == SO_HIP_SET_NAT_NONE)   {
         gui_update_nat(0);
         HIP_DEBUG("NAT extensions off.\n");
     } else if (type == SO_HIP_DAEMON_QUIT)   {

=== modified file 'hipd/update.c'
--- hipd/update.c       2010-03-03 15:59:44 +0000
+++ hipd/update.c       2010-03-19 09:25:52 +0000
@@ -184,9 +184,13 @@
     if (type == HIP_UPDATE_ECHO_REQUEST) {
         HIP_HEXDUMP("ECHO_REQUEST in the host association",
                     ha->echo_data, sizeof(ha->echo_data));
-        HIP_IFEBL2(hip_build_param_echo(update_packet_to_send, ha->echo_data,
-                                        sizeof(ha->echo_data), 1, 1),
-                   -1, return err, "Building of ECHO_REQUEST failed\n");
+        HIP_IFEL(hip_build_param_echo(update_packet_to_send,
+                                      ha->echo_data,
+                                      sizeof(ha->echo_data),
+                                      1,
+                                      1),
+                 -1,
+                 "Building of ECHO_REQUEST failed\n");
     }
 
     /* Add ECHO_RESPONSE (signed) */

=== modified file 'lib/core/icomm.h'
--- lib/core/icomm.h    2010-02-17 17:38:08 +0000
+++ lib/core/icomm.h    2010-03-19 09:25:52 +0000
@@ -146,7 +146,6 @@
 // free slot
 #define SO_HIP_SET_NAT_PLAIN_UDP                129
 #define SO_HIP_SET_NAT_NONE                     130
-#define SO_HIP_SET_NAT_OFF                      SO_HIP_SET_NAT_NONE // XX 
FIXME: REMOVE
 #define SO_HIP_SET_HIPPROXY_ON                  131
 #define SO_HIP_SET_HIPPROXY_OFF                 132
 #define SO_HIP_GET_PROXY_LOCAL_ADDRESS          133

=== modified file 'lib/core/ife.h'
--- lib/core/ife.h      2010-02-17 17:38:08 +0000
+++ lib/core/ife.h      2010-03-19 09:25:52 +0000
@@ -73,12 +73,13 @@
         } \
     }
 
-#define HIP_IFEBL2(func, eval, finally, args ...) \
+#define HIP_IFF(func, eval, finally, args ...) \
     { \
         if (func) { \
             HIP_ERROR(args); \
             err = eval; \
             finally; \
+            goto out_err; \
         } \
     }

Other related posts:

  • » [hipl-commit] [release-1.0.5] Rev 3799: Syncronized to trunk revisions 3815..3817 - Miika Komu