- (djm) [defines.h] Add IP DSCP defines

2 files changed, 39 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2e8fd43d6..905cb1159 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
  - (djm) [loginrec.c] Relax permission requirement on btmp logs to allow
    group read/write. ok dtucker@
  - (dtucker) [packet.c] Remove redundant local declaration of "int tos".
+ - (djm) [defines.h] Add IP DSCP defines
 
 20101122
  - (dtucker) Bug #1840: fix warning when configuring --with-ssl-engine, patch
diff --git a/defines.h b/defines.h
index 61203c3fe..ed438bd88 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.162 2010/10/25 05:54:28 dtucker Exp $ */
+/* $Id: defines.h,v 1.163 2010/11/23 23:50:05 djm Exp $ */
 
 
 /* Constants */
@@ -42,6 +42,9 @@ enum
 # define SHUT_RDWR SHUT_RDWR
 #endif
 
+/*
+ * Definitions for IP type of service (ip_tos)
+ */
 #ifndef IPTOS_LOWDELAY
 # define IPTOS_LOWDELAY          0x10
 # define IPTOS_THROUGHPUT        0x08
@@ -50,6 +53,40 @@ enum
 # define IPTOS_MINCOST           IPTOS_LOWCOST
 #endif /* IPTOS_LOWDELAY */
 
+/*
+ * Definitions for DiffServ Codepoints as per RFC2474
+ */
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#ifndef IPTOS_DSCP_AF11
+# define        IPTOS_DSCP_AF11         0x28
+# define        IPTOS_DSCP_AF12         0x30
+# define        IPTOS_DSCP_AF13         0x38
+# define        IPTOS_DSCP_AF21         0x48
+# define        IPTOS_DSCP_AF22         0x50
+# define        IPTOS_DSCP_AF23         0x58
+# define        IPTOS_DSCP_AF31         0x68
+# define        IPTOS_DSCP_AF32         0x70
+# define        IPTOS_DSCP_AF33         0x78
+# define        IPTOS_DSCP_AF41         0x88
+# define        IPTOS_DSCP_AF42         0x90
+# define        IPTOS_DSCP_AF43         0x98
+# define        IPTOS_DSCP_EF           0xb8
+#endif /* IPTOS_DSCP_AF11 */
+#ifndef IPTOS_DSCP_CS0
+# define        IPTOS_DSCP_CS0          0x00
+# define        IPTOS_DSCP_CS1          0x20
+# define        IPTOS_DSCP_CS2          0x40
+# define        IPTOS_DSCP_CS3          0x60
+# define        IPTOS_DSCP_CS4          0x80
+# define        IPTOS_DSCP_CS5          0xa0
+# define        IPTOS_DSCP_CS6          0xc0
+# define        IPTOS_DSCP_CS7          0xe0
+#endif /* IPTOS_DSCP_CS0 */
+#ifndef IPTOS_DSCP_EF
+# define        IPTOS_DSCP_EF           0xb8
+#endif /* IPTOS_DSCP_EF */
+
 #ifndef MAXPATHLEN
 # ifdef PATH_MAX
 #  define MAXPATHLEN PATH_MAX