[hipl-commit] [tiny] Rev 3513: Minor formatting changes.

  • From: Tim Just <tim.just@xxxxxxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Wed, 03 Feb 2010 12:49:19 +0200

Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Wed Feb 03 11:48:31 2010 +0100
Revision: 3513
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny

Log:
  Minor formatting changes.

Modified:
  M  hipd/hipd.c
  M  hipd/init.c
  M  lib/conf/hipconf.c
  M  modules/update/hipd/update_init.c

=== modified file 'hipd/hipd.c'
--- hipd/hipd.c 2010-02-02 07:39:08 +0000
+++ hipd/hipd.c 2010-02-03 10:48:31 +0000
@@ -349,7 +349,7 @@
 
        /* Allocate user message. */
        HIP_IFE(!(hipd_msg = hip_msg_alloc()), 1);
-        HIP_IFE(!(hipd_msg_v4 = hip_msg_alloc()), 1);
+       HIP_IFE(!(hipd_msg_v4 = hip_msg_alloc()), 1);
        HIP_DEBUG("Daemon running. Entering select loop.\n");
 
        /* Enter to the select-loop */
@@ -517,21 +517,21 @@
 
                        /* Read in the values to hip_msg, saddr, daddr and
                           pkt_info. */
-                       /* if ( hip_read_control_msg_v4(hip_nat_sock_udp, 
hipd_msg,&saddr, &daddr,&pkt_info, 0) ) */
-                       err = hip_read_control_msg_v4(hip_nat_sock_input_udp, 
hipd_msg,&saddr, &daddr,&pkt_info, HIP_UDP_ZERO_BYTES_LEN);
-                       if (err)
-                       {
-                                HIP_ERROR("Reading network msg failed\n");
-
-
+                       err = hip_read_control_msg_v4(hip_nat_sock_input_udp,
+                                                                               
  hipd_msg,&saddr,
+                                                                               
  &daddr,
+                                                                               
  &pkt_info,
+                                                                               
  HIP_UDP_ZERO_BYTES_LEN);
+                       if (err) {
+                               HIP_ERROR("Reading network msg failed\n");
+                       } else {
                                /* If the values were read in succesfully, we
                                   do the UDP specific stuff next. */
-                        }
-                       else
-                       {
-                          err =  hip_receive_udp_control_packet(hipd_msg, 
&saddr, &daddr, &pkt_info);
-                        }
-
+                               err =  hip_receive_udp_control_packet(hipd_msg,
+                                                                               
                          &saddr,
+                                                                               
                          &daddr,
+                                                                               
                          &pkt_info);
+                       }
                }
        
                if (FD_ISSET(hip_user_sock, &read_fdset))

=== modified file 'hipd/init.c'
--- hipd/init.c 2010-02-02 07:39:08 +0000
+++ hipd/init.c 2010-02-03 10:48:31 +0000
@@ -605,8 +605,9 @@
                nsupdate(1);
 
        /* Initialize modules */
+       HIP_INFO("Initializing modules.\n");
        for (i = 0; i < num_modules_hipd; i++) {
-               hipd_init_functions[i]();
+               HIP_IFEL(hipd_init_functions[i](), -1, "Module initialization 
failed.\n");
        }
 
 out_err:

=== modified file 'lib/conf/hipconf.c'
--- lib/conf/hipconf.c  2010-01-22 14:29:13 +0000
+++ lib/conf/hipconf.c  2010-02-03 10:48:31 +0000
@@ -142,9 +142,7 @@
 "nsupdate on|off\n"
 "hit-to-ip on|off\n"
 "hit-to-ip-zone <hit-to-ip.zone.>\n"
-"buddies on|off\n"
 "datapacket on|off\n"
-"shotgun on|off\n"
 "id-to-addr hit|lsi\n"                                                         
                                    
 ;
 

=== modified file 'modules/update/hipd/update_init.c'
--- modules/update/hipd/update_init.c   2010-02-02 07:55:10 +0000
+++ modules/update/hipd/update_init.c   2010-02-03 10:48:31 +0000
@@ -9,6 +9,6 @@
 
 int update_init(void)
 {
-       HIP_DEBUG("update_init called!\n");
+       HIP_DEBUG("update_init called.\n");
        return 0;
 }

Other related posts:

  • » [hipl-commit] [tiny] Rev 3513: Minor formatting changes. - Tim Just