Merge lp:~christof-mroz/hipl/rename-camelcased into lp:hipl

[Christof Mroz]

Renames camelcased identifiers to use an equivalent using underscores, or at least those found using the regex [a-z][A-Z].

[Stefan Götz (stefan.goetz-deactivatedaccount)]

Looks good to me

review: Approve

[René Hummen (rene-hummen)]

Does exactly what's promised in the description.

=== modified file 'firewall/conntrack.c'
--- firewall/conntrack.c	2011-03-11 10:18:34 +0000
+++ firewall/conntrack.c	2011-03-17 12:13:31 +0000
@@ -84,8 +84,8 @@
     STATE_CLOSING
 };
 
-int           timeoutChecking = 0;
-unsigned long timeoutValue    = 0;
+int           timeout_checking = 0;
+unsigned long timeout_value    = 0;
 
 /*------------print functions-------------*/
 /**

=== modified file 'firewall/firewall.c'
--- firewall/firewall.c	2011-03-10 11:53:43 +0000
+++ firewall/firewall.c	2011-03-17 12:13:31 +0000
@@ -1562,16 +1562,16 @@
 /**
  * Set an accept verdict for a modified packet
  *
- * @param handle ipqueue file handle
- * @param packetId ipqueue packet id
- * @param len length of buf
- * @param buf the packet to be accepted
+ * @param handle    ipqueue file handle
+ * @param packet_id ipqueue packet id
+ * @param len       length of buf
+ * @param buf       the packet to be accepted
  *
  */
-static void allow_modified_packet(struct ipq_handle *handle, unsigned long packetId,
+static void allow_modified_packet(struct ipq_handle *handle, unsigned long packet_id,
                                   size_t len, unsigned char *buf)
 {
-    ipq_set_verdict(handle, packetId, NF_ACCEPT, len, buf);
+    ipq_set_verdict(handle, packet_id, NF_ACCEPT, len, buf);
     HIP_DEBUG("Packet accepted with modifications\n\n");
 }
 
@@ -1579,12 +1579,12 @@
  * Allow a packet to pass
  *
  * @param handle    the handle for the packets.
- * @param packetId  the packet ID.
+ * @param packet_id the packet ID.
  * @return          nothing
  */
-static void allow_packet(struct ipq_handle *handle, unsigned long packetId)
+static void allow_packet(struct ipq_handle *handle, unsigned long packet_id)
 {
-    ipq_set_verdict(handle, packetId, NF_ACCEPT, 0, NULL);
+    ipq_set_verdict(handle, packet_id, NF_ACCEPT, 0, NULL);
 
     HIP_DEBUG("Packet accepted \n\n");
 }
@@ -1593,12 +1593,12 @@
  * Drop a packet
  *
  * @param handle    the handle for the packets.
- * @param packetId  the packet ID.
+ * @param packet_id the packet ID.
  * @return          nothing
  */
-static void drop_packet(struct ipq_handle *handle, unsigned long packetId)
+static void drop_packet(struct ipq_handle *handle, unsigned long packet_id)
 {
-    ipq_set_verdict(handle, packetId, NF_DROP, 0, NULL);
+    ipq_set_verdict(handle, packet_id, NF_DROP, 0, NULL);
 
     HIP_DEBUG("Packet dropped \n\n");
 }

=== modified file 'firewall/lsi.c'
--- firewall/lsi.c	2011-01-10 11:54:10 +0000
+++ firewall/lsi.c	2011-03-17 12:13:31 +0000
@@ -197,17 +197,17 @@
  * Executes the packet reinjection
  *
  *
- * @param src_hit              ipv6 source address
- * @param dst_hit              ipv6 destination address
- * @param m                    pointer to the packet
- * @param ipOrigTraffic        type of Traffic (IPv4 or IPv6)
- * @param incoming             packet direction
- * @return                     err during the reinjection
+ * @param src_hit         ipv6 source address
+ * @param dst_hit         ipv6 destination address
+ * @param m               pointer to the packet
+ * @param ip_orig_traffic type of Traffic (IPv4 or IPv6)
+ * @param incoming        packet direction
+ * @return                err during the reinjection
  */
 int hip_reinject_packet(const struct in6_addr *src_hit,
                         const struct in6_addr *dst_hit,
                         const ipq_packet_msg_t *m,
-                        const int ipOrigTraffic,
+                        const int ip_orig_traffic,
                         const int incoming)
 {
     int             err           = 0;
@@ -218,7 +218,7 @@
     uint8_t        *msg           = NULL;
     struct icmphdr *icmp          = NULL;
 
-    if (ipOrigTraffic == 4) {
+    if (ip_orig_traffic == 4) {
         const struct ip *iphdr = (const struct ip *) m->payload;
         ip_hdr_size = (iphdr->ip_hl * 4);
         protocol    = iphdr->ip_p;
@@ -309,7 +309,7 @@
     int                              err          = 0;
     int                              verdict      = 1;
     int                              ip_hdr_size  = 0;
-    int                              portDest     = 0;
+    int                              port_dest    = 0;
     struct hip_hadb_user_info_state *entry        = NULL;
     enum hip_port_binding            port_binding = HIP_PORT_INFO_UNKNOWN;
     const struct ip6_hdr            *ip6_hdr      = NULL;
@@ -320,10 +320,10 @@
 
     switch (ip6_hdr->ip6_nxt) {
     case IPPROTO_UDP:
-        portDest = ((const struct udphdr *) ((m->payload) + ip_hdr_size))->dest;
+        port_dest = ((const struct udphdr *) ((m->payload) + ip_hdr_size))->dest;
         break;
     case IPPROTO_TCP:
-        portDest = ((const struct tcphdr *) ((m->payload) + ip_hdr_size))->dest;
+        port_dest = ((const struct tcphdr *) ((m->payload) + ip_hdr_size))->dest;
         break;
     case IPPROTO_ICMPV6:
         HIP_DEBUG("ICMPv6 packet\n");
@@ -333,14 +333,15 @@
         break;
     }
 
-    port_binding = hip_port_bindings_get(ip6_hdr->ip6_nxt,
-                                         portDest);
+    port_binding = hip_port_bindings_get(ip6_hdr->ip6_nxt, port_dest);
 
     if (port_binding == HIP_PORT_INFO_IPV6BOUND) {
-        HIP_DEBUG("Port %d is bound to an IPv6 address -> accepting packet\n", portDest);
+        HIP_DEBUG("Port %d is bound to an IPv6 address -> accepting packet\n",
+                  port_dest);
         verdict = 1;
     } else if (port_binding == HIP_PORT_INFO_IPV6UNBOUND) {
-        HIP_DEBUG("Port %d is unbound or bound to an IPv4 address -> looking up in cache\n", portDest);
+        HIP_DEBUG("Port %d is unbound or bound to an IPv4 address -> looking up in cache\n",
+                  port_dest);
         HIP_IFEL(!(entry = hip_firewall_cache_db_match(ip_dst, ip_src,
                                                        FW_CACHE_HIT, 1)),
                  -1, "Failed to obtain from cache\n");

=== modified file 'firewall/lsi.h'
--- firewall/lsi.h	2010-10-15 15:29:14 +0000
+++ firewall/lsi.h	2011-03-17 12:13:31 +0000
@@ -52,7 +52,7 @@
 int hip_reinject_packet(const struct in6_addr *src_hit,
                         const struct in6_addr *dst_hit,
                         const ipq_packet_msg_t *m,
-                        const int ipOrigTraffic,
+                        const int ip_orig_traffic,
                         const int incoming);
 
 #endif /* HIP_FIREWALL_LSI_H */

=== modified file 'hipd/cookie.c'
--- hipd/cookie.c	2011-02-22 19:12:13 +0000
+++ hipd/cookie.c	2011-03-17 12:13:31 +0000
@@ -115,18 +115,18 @@
  */
 int hip_set_puzzle_difficulty_msg(struct hip_common *msg)
 {
-    const int       *newVal  = NULL;
+    const int       *new_val = NULL;
     const hip_hit_t *dst_hit = NULL;
 
     if (!(dst_hit = hip_get_param_contents(msg, HIP_PARAM_HIT))) {
         HIP_ERROR("No HIT set\n");
         return -1;
     }
-    if (!(newVal = hip_get_param_contents(msg, HIP_PARAM_INT))) {
+    if (!(new_val = hip_get_param_contents(msg, HIP_PARAM_INT))) {
         HIP_ERROR("No difficulty set\n");
         return -1;
     }
-    if (hip_set_cookie_difficulty(*newVal), -1) {
+    if (hip_set_cookie_difficulty(*new_val), -1) {
         HIP_ERROR("Setting difficulty failed\n");
         return -1;
     }

=== modified file 'lib/core/conf.c'
--- lib/core/conf.c	2011-02-20 17:25:58 +0000
+++ lib/core/conf.c	2011-03-17 12:13:31 +0000
@@ -1603,7 +1603,7 @@
                                   int optc,
                                   int send_only)
 {
-    int                          err  = 0, ret = 0, msg_type = 0, all, newVal = 0;
+    int                          err  = 0, ret = 0, msg_type = 0, all, new_val = 0;
     const int                   *diff = NULL;
     hip_hit_t                    hit  = { { { 0 } } }, all_zero_hit = { { { 0 } } };
     char                         hit_s[INET6_ADDRSTRLEN];
@@ -1667,7 +1667,7 @@
 
     /* obtain the new value for set */
     if ((msg_type == HIP_MSG_CONF_PUZZLE_SET) && (optc == 2)) {
-        newVal = atoi(opt[1]);
+        new_val = atoi(opt[1]);
     }
 
     /* Build a HIP message with socket option to get puzzle difficulty. */
@@ -1709,7 +1709,7 @@
 
     /* attach new val for the set action */
     if (msg_type == HIP_MSG_CONF_PUZZLE_SET) {
-        err = hip_build_param_contents(msg, &newVal, HIP_PARAM_INT,
+        err = hip_build_param_contents(msg, &new_val, HIP_PARAM_INT,
                                        sizeof(int));
         if (err) {
             HIP_ERROR("build param int failed: %s\n", strerror(err));