[hipl-commit] [tiny] Rev 3549: Removed 'agent' related parameter from hip_receive_control_packet.
- From: Tim Just <tim.just@xxxxxxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Tue, 23 Feb 2010 11:40:42 +0200
Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: Tue Feb 23 10:40:14 2010 +0100
Revision: 3549
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: tiny
Log:
Removed 'agent' related parameter from hip_receive_control_packet.
The parameter was not used anymore.
Modified:
M hipd/hipd.c
M hipd/input.c
M hipd/input.h
=== modified file 'hipd/hipd.c'
--- hipd/hipd.c 2010-02-17 15:59:39 +0000
+++ hipd/hipd.c 2010-02-23 09:40:14 +0000
@@ -277,7 +277,7 @@
hip_perf_open(perf_set);
#endif
- /* default is long format */
+ /* default is long format */
hip_set_logfmt(LOGFMT_LONG);
/* Parse command-line options */
@@ -344,14 +344,14 @@
HIP_IFEL(create_configs_and_exit, 0,
"Configs created, exiting\n");
- highest_descriptor = maxof(7,
- hip_nl_route.fd,
-
hip_raw_sock_input_v6,
- hip_user_sock,
- hip_nl_ipsec.fd,
-
hip_raw_sock_input_v4,
-
hip_nat_sock_input_udp,
- hip_icmp_sock);
+ highest_descriptor = maxof(7,
+ hip_nl_route.fd,
+ hip_raw_sock_input_v6,
+ hip_user_sock,
+ hip_nl_ipsec.fd,
+ hip_raw_sock_input_v4,
+ hip_nat_sock_input_udp,
+ hip_icmp_sock);
/* Allocate user message. */
HIP_IFE(!(hipd_msg = hip_msg_alloc()), 1);
@@ -397,7 +397,7 @@
}
#endif
- err = select((highest_descriptor + 1), &read_fdset, NULL, NULL,
&timeout);
+ err = select((highest_descriptor + 1), &read_fdset, NULL, NULL,
&timeout);
if (err < 0) {
HIP_ERROR("select() error: %s.\n", strerror(errno));
@@ -435,23 +435,23 @@
type = hip_get_msg_type(hipd_msg_v4);
if (type == HIP_R2) {
err = hip_receive_control_packet(hipd_msg_v4, &saddr_v4,
- &daddr_v4, &pkt_info, 1);
+ &daddr_v4, &pkt_info);
if (err) {
HIP_ERROR("hip_receive_control_packet()!\n");
}
err = hip_receive_control_packet(hipd_msg, &saddr, &daddr,
- &pkt_info, 1);
+ &pkt_info);
if (err) {
HIP_ERROR("hip_receive_control_packet()!\n");
}
} else {
err = hip_receive_control_packet(hipd_msg, &saddr, &daddr,
- &pkt_info, 1);
+ &pkt_info);
if (err) {
HIP_ERROR("hip_receive_control_packet()!\n");
}
err = hip_receive_control_packet(hipd_msg_v4, &saddr_v4,
- &daddr_v4, &pkt_info, 1);
+ &daddr_v4, &pkt_info);
if (err) {
HIP_ERROR("hip_receive_control_packet()!\n");
}
@@ -476,7 +476,7 @@
&saddr, &daddr, &pkt_info, 0)) {
HIP_ERROR("Reading network msg failed\n");
} else {
- err = hip_receive_control_packet(hipd_msg, &saddr, &daddr,
&pkt_info, 1);
+ err = hip_receive_control_packet(hipd_msg, &saddr, &daddr,
&pkt_info);
if (err) {
HIP_ERROR("hip_receive_control_packet()!\n");
}
@@ -499,7 +499,7 @@
&saddr, &daddr, &pkt_info,
IPV4_HDR_SIZE)) {
HIP_ERROR("Reading network msg failed\n");
} else {
- err = hip_receive_control_packet(hipd_msg, &saddr, &daddr,
&pkt_info, 1);
+ err = hip_receive_control_packet(hipd_msg, &saddr, &daddr,
&pkt_info);
if (err) {
HIP_ERROR("hip_receive_control_packet()!\n");
}
@@ -507,7 +507,6 @@
}
}
-
if (FD_ISSET(hip_icmp_sock, &read_fdset)) {
HIP_IFEL(hip_icmp_recvmsg(hip_icmp_sock), -1,
"Failed to recvmsg from ICMPv6\n");
=== modified file 'hipd/input.c'
--- hipd/input.c 2010-02-22 18:30:02 +0000
+++ hipd/input.c 2010-02-23 09:40:14 +0000
@@ -502,14 +502,12 @@
* @param daddr a pointer to the destination address where to the packet was
* sent to (own address).
* @param info a pointer to the source and destination ports.
- * @param filter Whether to filter trough agent or not.
* @return zero on success, or negative error value on error.
*/
int hip_receive_control_packet(struct hip_common *msg,
struct in6_addr *src_addr,
struct in6_addr *dst_addr,
- hip_portpair_t *msg_info,
- int filter)
+ hip_portpair_t *msg_info)
{
hip_ha_t tmp, *entry = NULL;
int err = 0, type, skip_sync = 0;
@@ -783,7 +781,7 @@
saddr_public = &entry->peer_addr;
}
#endif
- HIP_IFEL(hip_receive_control_packet(msg, saddr_public, daddr, info, 1), -1,
+ HIP_IFEL(hip_receive_control_packet(msg, saddr_public, daddr, info), -1,
"receiving of control packet failed\n");
out_err:
return err;
=== modified file 'hipd/input.h'
--- hipd/input.h 2010-02-22 17:37:48 +0000
+++ hipd/input.h 2010-02-23 09:40:14 +0000
@@ -77,8 +77,7 @@
int hip_receive_control_packet(struct hip_common *msg,
struct in6_addr *src_addr,
struct in6_addr *dst_addr,
- hip_portpair_t *msg_info,
- int filter);
+ hip_portpair_t *msg_info);
int hip_receive_udp_control_packet(struct hip_common *msg,
struct in6_addr *saddr,
Other related posts:
- » [hipl-commit] [tiny] Rev 3549: Removed 'agent' related parameter from hip_receive_control_packet. - Tim Just
