[Differential] [Request, 6 lines] D1388: IP6: Turned on verbose logging for fragment handling code

[kibab (Ilya Bakulin)]

kibab created this revision.
kibab added a reviewer: bz.
kibab added a subscriber: freebsd-net.

REVISION SUMMARY
  Implement behavior suggested by RFC5722: drop the fragment queue
  entirely if the system receives a duplicate fragment

TEST PLAN
  Send a fragmented packet to the system, then send one of the fragments
  once again. One can use frag6 tests from the OpenBSD regression suite.

BRANCH
  provost_pfrag

REVISION DETAIL
  https://reviews.freebsd.org/D1388

AFFECTED FILES
  sys/netinet6/frag6.c

To: kibab, bz
Cc: freebsd-net
___
freebsd-net@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-net
To unsubscribe, send any mail to "freebsd-net-unsubscr...@freebsd.org"

[Differential] [Commented On] D1388: IP6: Turned on verbose logging for fragment handling code

[kibab (Ilya Bakulin)]

kibab added a comment.

I have added the wrong revision to the review!

This is the correct one, I couldn't edit the patch itself :-(

--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -63,7 +63,7 @@ static void frag6_enq(struct ip6asfrag *, struct ip6asfrag *);
 static void frag6_deq(struct ip6asfrag *);
 static void frag6_insque(struct ip6q *, struct ip6q *);
 static void frag6_remque(struct ip6q *);
-static void frag6_freef(struct ip6q *);
+static void frag6_freef(struct ip6q *, int);
 
 static struct mtx ip6qlock;
 /*
@@ -459,6 +459,7 @@ frag6_input(struct mbuf **mp, int *offp, int proto)
i, ip6_sprintf(ip6buf, &q6->ip6q_src));
 #endif
free(ip6af, M_FTABLE);
+frag6_freef(q6, 0);
goto dropfrag;
}
}
@@ -471,6 +472,7 @@ frag6_input(struct mbuf **mp, int *offp, int proto)
i, ip6_sprintf(ip6buf, &q6->ip6q_src));
 #endif
free(ip6af, M_FTABLE);
+frag6_freef(q6, 0);
goto dropfrag;
}
}
@@ -603,7 +605,7 @@ insert:
  * associated datagrams.
  */
 void
-frag6_freef(struct ip6q *q6)
+frag6_freef(struct ip6q *q6, int sendicmp)
 {
struct ip6asfrag *af6, *down6;
 
@@ -620,7 +622,7 @@ frag6_freef(struct ip6q *q6)
 * Return ICMP time exceeded error for the 1st fragment.
 * Just free other fragments.
 */
-   if (af6->ip6af_off == 0) {
+   if (af6->ip6af_off == 0 && sendicmp == 1) {
struct ip6_hdr *ip6;
 
/* adjust pointer */
@@ -719,7 +721,7 @@ frag6_slowtimo(void)
if (q6->ip6q_prev->ip6q_ttl == 0) {
IP6STAT_INC(ip6s_fragtimeout);
/* XXX in6_ifstat_inc(ifp, 
ifs6_reass_fail) */
-   frag6_freef(q6->ip6q_prev);
+   frag6_freef(q6->ip6q_prev, 1);
}
}
/*
@@ -731,7 +733,7 @@ frag6_slowtimo(void)
V_ip6q.ip6q_prev) {
IP6STAT_INC(ip6s_fragoverflow);
/* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */
-   frag6_freef(V_ip6q.ip6q_prev);
+   frag6_freef(V_ip6q.ip6q_prev, 1);
}
CURVNET_RESTORE();
}
@@ -757,7 +759,7 @@ frag6_drain(void)
while (V_ip6q.ip6q_next != &V_ip6q) {
IP6STAT_INC(ip6s_fragdropped);
/* XXX in6_ifstat_inc(ifp, ifs6_reass_fail) */
-   frag6_freef(V_ip6q.ip6q_next);
+   frag6_freef(V_ip6q.ip6q_next, 1);
}
CURVNET_RESTORE();
}

REVISION DETAIL
  https://reviews.freebsd.org/D1388

To: kibab, bz
Cc: freebsd-net
___
freebsd-net@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-net
To unsubscribe, send any mail to "freebsd-net-unsubscr...@freebsd.org"

[Differential] [Updated, 20 lines] D1388: IP6: Turned on verbose logging for fragment handling code

[kibab (Ilya Bakulin)]

kibab updated this revision to Diff 2902.

CHANGES SINCE LAST UPDATE
  https://reviews.freebsd.org/D1388?vs=2901&id=2902

BRANCH
  provost_pfrag

REVISION DETAIL
  https://reviews.freebsd.org/D1388

AFFECTED FILES
  sys/netinet6/frag6.c

To: kibab, bz
Cc: freebsd-net
___
freebsd-net@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-net
To unsubscribe, send any mail to "freebsd-net-unsubscr...@freebsd.org"

[Differential] [Updated, 14 lines] D1388: IP6: Turned on verbose logging for fragment handling code

[kibab (Ilya Bakulin)]

kibab updated this revision to Diff 2903.

CHANGES SINCE LAST UPDATE
  https://reviews.freebsd.org/D1388?vs=2902&id=2903

REVISION DETAIL
  https://reviews.freebsd.org/D1388

AFFECTED FILES
  sys/netinet6/frag6.c

To: kibab, bz
Cc: freebsd-net
___
freebsd-net@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-net
To unsubscribe, send any mail to "freebsd-net-unsubscr...@freebsd.org"

[Differential] D1388: IP6: Turned on verbose logging for fragment handling code

[kibab (Ilya Bakulin)]

kibab abandoned this revision.
kibab added a comment.


  This is an ancient sh*t and nobody cares.

REVISION DETAIL
  https://reviews.freebsd.org/D1388

EMAIL PREFERENCES
  https://reviews.freebsd.org/settings/panel/emailpreferences/

To: kibab, bz
Cc: ae, freebsd-net-list
___
freebsd-net@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-net
To unsubscribe, send any mail to "freebsd-net-unsubscr...@freebsd.org"