[hipl-commit] [trunk] Rev 4551: the grand #include cleanup - part II: lib/opphip/ directory

  • From: Diego Biurrun <diego@xxxxxxxxxx>
  • To: hipl-commit@xxxxxxxxxxxxx
  • Date: Tue, 18 May 2010 10:56:19 +0300

Committer: Diego Biurrun <diego@xxxxxxxxxx>
Date: 18/05/2010 at 10:56:19
Revision: 4551
Revision-id: diego@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk

Log:
  the grand #include cleanup - part II: lib/opphip/ directory
    
  Add required headers, remove unnecessary headers, reorder #includes.

Modified:
  M  lib/opphip/wrap.c
  M  lib/opphip/wrap_db.c
  M  lib/opphip/wrap_db.h

=== modified file 'lib/opphip/wrap.c'
--- lib/opphip/wrap.c   2010-05-17 22:11:11 +0000
+++ lib/opphip/wrap.c   2010-05-18 07:55:52 +0000
@@ -14,22 +14,34 @@
 
 #define _BSD_SOURCE
 
+#include <dlfcn.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <sys/types.h>
-#include <unistd.h>
+
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
+#include "lib/core/ife.h"
+#include "lib/core/message.h"
+#include "lib/core/prefix.h"
+#include "lib/core/protodefs.h"
+
+#include "wrap_db.h"
+
 #include <errno.h>
 #include <netinet/tcp.h>
-#include <dlfcn.h>
 #include <pthread.h>
 #include <poll.h>
 
 #include "config.h"
-#include "lib/core/debug.h"
-#include "lib/core/message.h"
 #include "hipd/hadb.h"
 #include "lib/core/hashtable.h"
 #include "lib/tool/lutil.h"
 #include "lib/core/icomm.h"
-#include "wrap_db.h"
 
 int hip_db_exist = 0;
 

=== modified file 'lib/opphip/wrap_db.c'
--- lib/opphip/wrap_db.c        2010-05-17 22:11:11 +0000
+++ lib/opphip/wrap_db.c        2010-05-18 07:55:52 +0000
@@ -8,18 +8,18 @@
  *
  */
 
-#include <sys/types.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stddef.h>
-#include <sys/socket.h>
 #include <pthread.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include "config.h"
+#include "lib/core/builder.h"
+#include "lib/core/debug.h"
 #include "lib/core/hashtable.h"
-#include "hipd/hadb.h"
+#include "lib/core/list.h"
 #include "wrap_db.h"
 
+
 /** Hash table to store information on translated sockets */
 HIP_HASHTABLE *socketdb;
 

=== modified file 'lib/opphip/wrap_db.h'
--- lib/opphip/wrap_db.h        2010-04-22 10:12:54 +0000
+++ lib/opphip/wrap_db.h        2010-05-18 07:55:52 +0000
@@ -7,11 +7,13 @@
 #ifndef HIP_LIB_OPPHIP_WRAP_DB_H
 #define HIP_LIB_OPPHIP_WRAP_DB_H
 
+#include <pthread.h>
+#include <sys/socket.h>
 #include <sys/types.h>
-#include <netinet/in.h>
 
 #include "lib/core/protodefs.h"
 
+
 struct hip_opp_socket_entry {
     pid_t                   pid;
     int                     orig_socket;

Other related posts:

  • » [hipl-commit] [trunk] Rev 4551: the grand #include cleanup - part II: lib/opphip/ directory - Diego Biurrun