Do not have to change timers

sctplab · Dec 11, 2017 · 10fa12f · 10fa12f
1 parent 6bafb12
commit 10fa12f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 9 deletions.
diff --git a/usrsctplib/netinet/sctp_callout.c b/usrsctplib/netinet/sctp_callout.c
@@ -144,8 +144,8 @@ sctp_os_timer_stop(sctp_os_timer_t *c)
 	return (1);
 }
 
-void
-sctp_handle_tick(unsigned int delta)
+static void
+sctp_handle_tick(int delta)
 {
 	sctp_os_timer_t *c;
 	void (*c_func)(void *);

diff --git a/usrsctplib/netinet/sctp_callout.h b/usrsctplib/netinet/sctp_callout.h
@@ -90,7 +90,6 @@ typedef struct sctp_callout sctp_os_timer_t;
 void sctp_os_timer_init(sctp_os_timer_t *tmr);
 void sctp_os_timer_start(sctp_os_timer_t *, int, void (*)(void *), void *);
 int sctp_os_timer_stop(sctp_os_timer_t *);
-void sctp_handle_tick(unsigned int);
 
 #define SCTP_OS_TIMER_INIT	sctp_os_timer_init
 #define SCTP_OS_TIMER_START	sctp_os_timer_start

diff --git a/usrsctplib/netinet/sctputil.c b/usrsctplib/netinet/sctputil.c
@@ -7865,7 +7865,7 @@ sctp_recv_icmp_tunneled_packet(int cmd, struct sockaddr *sa, void *vip, void *ct
 		}
 		sctp_notify(inp, stcb, net, type, code,
 		            ntohs(inner_ip->ip_len),
-		            ntohs(icmp->icmp_nextmtu));
+		            (uint32_t)ntohs(icmp->icmp_nextmtu));
 #if defined(__Userspace__)
 			if (stcb && upcall_socket == NULL && !(stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE)) {
 				if (stcb->sctp_socket != NULL) {

diff --git a/usrsctplib/user_socket.c b/usrsctplib/user_socket.c
@@ -3500,11 +3500,6 @@ usrsctp_conninput(void *addr, const void *buffer, size_t length, uint8_t ecn_bit
 	return;
 }
 
-void usrsctp_handle_timers(unsigned int delta)
-{
-	sctp_handle_tick(MSEC_TO_TICKS(delta));
-}
-
 int
 usrsctp_get_events(struct socket *so)
 {
-Original file line number
+Diff line change
@@ Expand Up @@
     	return;
     }
-    void usrsctp_handle_timers(unsigned int delta)
-    {
-    	sctp_handle_tick(MSEC_TO_TICKS(delta));
-    }
     int
     usrsctp_get_events(struct socket *so)
     {
@@ Expand Down @@