Move struct socket_info in socket_info.h

OpenSIPS · Apr 17, 2018 · b723bd9 · b723bd9
1 parent a0373e5
commit b723bd9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/ip_addr.h b/ip_addr.h
@@ -68,7 +68,6 @@ struct ip_addr{
 };
 
 
-
 struct net{
 	struct ip_addr ip;
 	struct ip_addr mask;
@@ -85,28 +84,6 @@ union sockaddr_union{
 enum si_flags { SI_NONE=0, SI_IS_IP=1, SI_IS_LO=2, SI_IS_MCAST=4,
 	SI_IS_ANYCAST=8 };
 
-struct socket_info {
-	int socket;
-	str name; /*!< name - eg.: foo.bar or 10.0.0.1 */
-	struct ip_addr address; /*!< ip address */
-	str address_str;        /*!< ip address converted to string -- optimization*/
-	unsigned short port_no;  /*!< port number */
-	str port_no_str; /*!< port number converted to string -- optimization*/
-	enum si_flags flags; /*!< SI_IS_IP | SI_IS_LO | SI_IS_MCAST | SI_IS_ANYCAST */
-	union sockaddr_union su;
-	int proto; /*!< tcp or udp*/
-	str sock_str;
-	str adv_sock_str;
-	str adv_name_str; /* Advertised name of this interface */
-	str adv_port_str; /* Advertised port of this interface */
-	struct ip_addr adv_address; /* Advertised address in ip_addr form (for find_si) */
-	unsigned short adv_port;    /* optimization for grep_sock_info() */
-	unsigned short children;
-	struct socket_info* next;
-	struct socket_info* prev;
-};
-
-
 struct receive_info {
 	struct ip_addr src_ip;
 	struct ip_addr dst_ip;

diff --git a/modules/presence/utils_func.h b/modules/presence/utils_func.h
@@ -32,6 +32,7 @@
 #include <string.h>
 #include "../../mem/mem.h"
 #include "../../dprint.h"
+#include "../../socket_info.h"
 #include "../../str.h"
 #include "../../parser/msg_parser.h"
 

diff --git a/modules/usrloc/ucontact.h b/modules/usrloc/ucontact.h
@@ -42,6 +42,7 @@
 #include "../../qvalue.h"
 #include "../../str.h"
 #include "../../proxy.h"
+#include "../../socket_info.h"
 #include "../../db/db_insertq.h"
 
 

diff --git a/msg_translator.h b/msg_translator.h
@@ -52,6 +52,7 @@
 
 #include "parser/msg_parser.h"
 #include "ip_addr.h"
+#include "socket_info.h"
 #include "context.h"
 #include "globals.h"
 

diff --git a/socket_info.h b/socket_info.h
@@ -36,7 +36,27 @@
 #include "globals.h"
 #include "net/trans.h"
 #include "ut.h"
-/* struct socket_info is defined in ip_addr.h */
+
+struct socket_info {
+	int socket;
+	str name; /*!< name - eg.: foo.bar or 10.0.0.1 */
+	struct ip_addr address; /*!< ip address */
+	str address_str;        /*!< ip address converted to string -- optimization*/
+	unsigned short port_no;  /*!< port number */
+	str port_no_str; /*!< port number converted to string -- optimization*/
+	enum si_flags flags; /*!< SI_IS_IP | SI_IS_LO | SI_IS_MCAST | SI_IS_ANYCAST */
+	union sockaddr_union su;
+	int proto; /*!< tcp or udp*/
+	str sock_str;
+	str adv_sock_str;
+	str adv_name_str; /* Advertised name of this interface */
+	str adv_port_str; /* Advertised port of this interface */
+	struct ip_addr adv_address; /* Advertised address in ip_addr form (for find_si) */
+	unsigned short adv_port;    /* optimization for grep_sock_info() */
+	unsigned short children;
+	struct socket_info* next;
+	struct socket_info* prev;
+};
 
 #define NUM_IP_OCTETS	4
 #define PROTO_NAME_MAX_SIZE  8 /* CHANGEME if you define a bigger protocol name