[hipl-commit] [trunk] Rev 4730: lib/core/ header cleanup
- From: Artturi Karila <artturi.karila@xxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Wed, 9 Jun 2010 11:34:29 +0300
Committer: Artturi Karila <artturi.karila@xxxxxxxxxx>
Date: 09/06/2010 at 11:34:29
Revision: 4730
Revision-id: artturi.karila@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
lib/core/ header cleanup
Removed unused defines.
Modified:
M lib/core/conf.c
M lib/core/icomm.h
M lib/core/protodefs.h
M lib/core/state.h
=== modified file 'lib/core/conf.c'
--- lib/core/conf.c 2010-06-01 13:26:07 +0000
+++ lib/core/conf.c 2010-06-09 08:34:27 +0000
@@ -101,7 +101,7 @@
#define ACTION_HEARTBEAT 26
#define ACTION_HIT_TO_LSI 28
-#define ACTION_BUDDIES 29
+/* unused, was ACTION_BUDDIES 29 */
#define ACTION_NSUPDATE 30
#define ACTION_HIT_TO_IP 31
#define ACTION_HIT_TO_IP_SET 32
@@ -149,10 +149,7 @@
#define TYPE_ORDER 24
/* free slots */
#define TYPE_HEARTBEAT 27
-
-/* free slot (was for TYPE_GET_PEER_LSI 29) */
-#define TYPE_BUDDIES 30
-/* free slot */
+/* free slots */
#define TYPE_NSUPDATE 32
#define TYPE_HIT_TO_IP 33
#define TYPE_HIT_TO_IP_SET 34
@@ -214,7 +211,6 @@
"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"
@@ -561,8 +557,6 @@
ret = ACTION_MANUAL_UPDATE;
} else if (!strcmp("hit-to-lsi", argv[1])) {
ret = ACTION_HIT_TO_LSI;
- } else if (!strcmp("buddies", argv[1])) {
- ret = ACTION_BUDDIES;
} else if (!strcmp("nsupdate", argv[1])) {
ret = ACTION_NSUPDATE;
} else if (!strcmp("hit-to-ip-set", argv[1])) {
@@ -714,8 +708,6 @@
ret = TYPE_MANUAL_UPDATE;
} else if (strcmp("hit-to-lsi", argv[1]) == 0) {
ret = TYPE_HIT_TO_LSI;
- } else if (strcmp("buddies", argv[1]) == 0) {
- ret = TYPE_BUDDIES;
} else if (strcmp("nsupdate", argv[1]) == 0) {
ret = TYPE_NSUPDATE;
} else if (strcmp("hit-to-ip-set", argv[1]) == 0) {
@@ -760,7 +752,6 @@
case ACTION_GET:
case ACTION_RUN:
case ACTION_LOAD:
- case ACTION_BUDDIES:
case ACTION_HEARTBEAT:
case ACTION_LOCATOR:
case ACTION_RST:
=== modified file 'lib/core/icomm.h'
--- lib/core/icomm.h 2010-06-02 08:12:55 +0000
+++ lib/core/icomm.h 2010-06-09 08:34:27 +0000
@@ -41,20 +41,12 @@
#define HIP_MSG_ANY_MIN 1
#define HIP_MSG_ADD_PEER_MAP_HIT_IP 2
#define HIP_MSG_DEL_PEER_MAP_HIT_IP 3
-/* slot free */
-#define HIP_MSG_SET_MY_EID 5
-/* slot free */
-#define HIP_MSG_SET_PEER_EID 7
+/* free slots */
#define HIP_MSG_NULL_OP 8
-#define HIP_MSG_QUERY_OPPORTUNISTIC_MODE 9
-#define HIP_MSG_ANSWER_OPPORTUNISTIC_MODE_QUERY 10
-/* slot free */
-#define HIP_MSG_QUERY_IP_HIT_MAPPING 12
-#define HIP_MSG_ANSWER_IP_HIT_MAPPING_QUERY 13
+/* free slots */
#define HIP_MSG_GET_PEER_HIT 14
/* free slot */
#define HIP_MSG_DEFAULT_HIT 16
-#define HIP_MSG_GET_PEER_LIST 17
/* Free slots here */
#define HIP_MSG_GET_HITS 21
#define HIP_MSG_GET_HA_INFO 22
@@ -81,7 +73,7 @@
#define HIP_MSG_CONF_PUZZLE_SET 74
#define HIP_MSG_CONF_PUZZLE_INC 75
#define HIP_MSG_CONF_PUZZLE_DEC 76
-#define HIP_MSG_STUN 77
+/* free slot */
#define HIP_MSG_SET_OPPORTUNISTIC_MODE 78
/* Free slots here */
#define HIP_MSG_SET_DEBUG_ALL 82
@@ -154,8 +146,6 @@
#define HIP_MSG_FW_BEX_DONE 157
#define HIP_MSG_RESTART_DUMMY_INTERFACE 158
/* free slots */
-#define HIP_MSG_BUDDIES_ON 162
-#define HIP_MSG_BUDDIES_OFF 163
#define HIP_MSG_TURN_INFO 164
/* Free slots here */
#define HIP_MSG_NSUPDATE_OFF 179
@@ -188,7 +178,6 @@
/* inclusive */
#define HIP_MSG_ROOT_MAX 255
-#define HIP_MSG_SET_NAT_ON HIP_MSG_SET_NAT_PLAIN_UDP
#define FLUSH_HA_INFO_DB 1
=== modified file 'lib/core/protodefs.h'
--- lib/core/protodefs.h 2010-06-02 07:57:43 +0000
+++ lib/core/protodefs.h 2010-06-09 08:34:27 +0000
@@ -739,12 +739,6 @@
} id;
};
-struct sockaddr_eid {
- unsigned short int eid_family;
- uint16_t eid_port;
- sa_eid_t eid_val;
-} __attribute__ ((packed));
-
/**
* Use accessor functions defined in builder.c, do not access members
* directly to avoid hassle with byte ordering and number conversion.
=== modified file 'lib/core/state.h'
--- lib/core/state.h 2010-06-02 07:30:33 +0000
+++ lib/core/state.h 2010-06-09 08:34:27 +0000
@@ -18,9 +18,6 @@
#define HIP_ENDPOINT_FLAG_PUBKEY 0
#define HIP_ENDPOINT_FLAG_HIT 1
#define HIP_ENDPOINT_FLAG_ANON 2
-#define HIP_HI_REUSE_UID 4
-#define HIP_HI_REUSE_GID 8
-#define HIP_HI_REUSE_ANY 16
/* Other flags: keep them to the power of two! */
@@ -62,7 +59,7 @@
//NAT branch
#define HIP_LOCATOR_LOCATOR_TYPE_UDP 2
-#define HIP_LOCATOR_LOCATOR_TYPE_ESP_SPI_PRIORITY 126
+/* #define HIP_LOCATOR_LOCATOR_TYPE_ESP_SPI_PRIORITY 126 */
/* #define HIP_LOCATOR_LOCATOR_TYPE_REFLEXIVE_PRIORITY 120 */
/** for the triple nat mode*/
#define HIP_NAT_MODE_NONE 0
Other related posts:
- » [hipl-commit] [trunk] Rev 4730: lib/core/ header cleanup - Artturi Karila
