From 166b75c2595b0720b91f0c34dd64ede9d899d558 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 16 Sep 2016 20:59:35 -0400 Subject: [PATCH] lib, ospfd: Remove ospf specific #define from zebra.h zebra.h should not know or care about ospf specific code Signed-off-by: Donald Sharp --- lib/zebra.h | 20 -------------------- ospfd/ospf_packet.c | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/zebra.h b/lib/zebra.h index 884cd76e8a..9a9a12f41f 100644 --- a/lib/zebra.h +++ b/lib/zebra.h @@ -317,26 +317,6 @@ struct in_pktinfo }; #endif -/* - * OSPF Fragmentation / fragmented writes - * - * ospfd can support writing fragmented packets, for cases where - * kernel will not fragment IP_HDRINCL and/or multicast destined - * packets (ie TTBOMK all kernels, BSD, SunOS, Linux). However, - * SunOS, probably BSD too, clobber the user supplied IP ID and IP - * flags fields, hence user-space fragmentation will not work. - * Only Linux is known to leave IP header unmolested. - * Further, fragmentation really should be done the kernel, which already - * supports it, and which avoids nasty IP ID state problems. - * - * Fragmentation of OSPF packets can be required on networks with router - * with many many interfaces active in one area, or on networks with links - * with low MTUs. - */ -#ifdef GNU_LINUX -#define WANT_OSPF_WRITE_FRAGMENT -#endif - /* * IP_HDRINCL / struct ip byte order * diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 399a558a0d..b7ef24409e 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -49,6 +49,26 @@ #include "ospfd/ospf_flood.h" #include "ospfd/ospf_dump.h" +/* + * OSPF Fragmentation / fragmented writes + * + * ospfd can support writing fragmented packets, for cases where + * kernel will not fragment IP_HDRINCL and/or multicast destined + * packets (ie TTBOMK all kernels, BSD, SunOS, Linux). However, + * SunOS, probably BSD too, clobber the user supplied IP ID and IP + * flags fields, hence user-space fragmentation will not work. + * Only Linux is known to leave IP header unmolested. + * Further, fragmentation really should be done the kernel, which already + * supports it, and which avoids nasty IP ID state problems. + * + * Fragmentation of OSPF packets can be required on networks with router + * with many many interfaces active in one area, or on networks with links + * with low MTUs. + */ +#ifdef GNU_LINUX +#define WANT_OSPF_WRITE_FRAGMENT +#endif + /* Packet Type String. */ const struct message ospf_packet_type_str[] = { -- 2.39.5