hipl-core team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4945
committer: Christof Mroz <christof.mroz@xxxxxxxxxxxxxx>
branch nick: hipfw-performance
timestamp: Wed 2010-09-15 21:55:26 +0200
message:
  Align preprocessor directives at leftmost column.
modified:
  firewall/conntrack.c
  hipd/input.c
  lib/core/builder.c
  lib/core/prefix.h


--
lp:~christof-mroz/hipl/hipfw-performance
https://code.launchpad.net/~christof-mroz/hipl/hipfw-performance

Your team HIPL core team is subscribed to branch lp:~christof-mroz/hipl/hipfw-performance.
To unsubscribe from this branch go to https://code.launchpad.net/~christof-mroz/hipl/hipfw-performance/+edit-subscription

=== modified file 'firewall/conntrack.c'
--- firewall/conntrack.c	2010-09-15 14:10:32 +0000
+++ firewall/conntrack.c	2010-09-15 19:55:26 +0000
@@ -1735,10 +1735,10 @@
 
         tuple->hook = ctx->ipq_packet->hook;
 
-        #ifdef CONFIG_HIP_DEBUG
+#ifdef CONFIG_HIP_DEBUG
         memcpy(&tuple->src_ip, &ctx->src, sizeof(struct in6_addr));
         memcpy(&tuple->dst_ip, &ctx->dst, sizeof(struct in6_addr));
-        #endif
+#endif
     }
 
     HIP_DEBUG("udp_encap_hdr=%p tuple=%p err=%d\n", ctx->udp_encap_hdr, tuple, err);

=== modified file 'hipd/input.c'
--- hipd/input.c	2010-09-09 01:12:24 +0000
+++ hipd/input.c	2010-09-15 19:55:26 +0000
@@ -1662,18 +1662,18 @@
     /* Store peer's public key and HIT to HA */
      HIP_IFE(hip_init_peer(ctx->hadb_entry, host_id_in_enc), -EINVAL);
      /* Validate signature */
- #ifdef CONFIG_HIP_PERFORMANCE
+#ifdef CONFIG_HIP_PERFORMANCE
      HIP_DEBUG("Start PERF_VERIFY(2)\n");
      hip_perf_start_benchmark(perf_set, PERF_VERIFY);
- #endif
+#endif
      HIP_IFEL(ctx->hadb_entry->verify(ctx->hadb_entry->peer_pub_key,
                                       ctx->input_msg),
               -EINVAL,
               "Verification of I2 signature failed\n");
- #ifdef CONFIG_HIP_PERFORMANCE
+#ifdef CONFIG_HIP_PERFORMANCE
      HIP_DEBUG("Stop PERF_VERIFY(2)\n");
      hip_perf_stop_benchmark(perf_set, PERF_VERIFY);
- #endif
+#endif
 
     if ((r1cntr = hip_get_param(ctx->input_msg, HIP_PARAM_R1_COUNTER))) {
         ctx->hadb_entry->birthday = r1cntr->generation;

=== modified file 'lib/core/builder.c'
--- lib/core/builder.c	2010-08-29 16:24:14 +0000
+++ lib/core/builder.c	2010-09-15 19:55:26 +0000
@@ -105,7 +105,7 @@
 
 /* ARRAY_SIZE is defined in linux/kernel.h, but it is in #ifdef __KERNEL__ */
 #ifndef ARRAY_SIZE
-  #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif /* ARRAY_SIZE */
 
 enum select_dh_key_t { STRONGER_KEY, WEAKER_KEY };

=== modified file 'lib/core/prefix.h'
--- lib/core/prefix.h	2010-08-19 09:32:20 +0000
+++ lib/core/prefix.h	2010-09-15 19:55:26 +0000
@@ -131,11 +131,11 @@
 #endif
 
 #if __BYTE_ORDER == __BIG_ENDIAN
-  #define hton64(i) (i)
-  #define ntoh64(i) (i)
+#define hton64(i) (i)
+#define ntoh64(i) (i)
 #else
-  #define hton64(i) (((uint64_t) (htonl((i) & 0xffffffff)) << 32) | htonl(((i) >> 32) & 0xffffffff ))
-  #define ntoh64 hton64
+#define hton64(i) (((uint64_t) (htonl((i) & 0xffffffff)) << 32) | htonl(((i) >> 32) & 0xffffffff ))
+#define ntoh64 hton64
 #endif
 
 #endif /* HIP_LIB_CORE_PREFIX_H */