summaryrefslogtreecommitdiff
path: root/defines.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2011-01-24 11:46:57 +0000
committerColin Watson <cjwatson@debian.org>2011-01-24 11:46:57 +0000
commit0970072c89b079b022538e3c366fbfa2c53fc821 (patch)
treeb7024712d74234bb5a8b036ccbc9109e2e211296 /defines.h
parent4e8aa4da57000c7bba8e5c49163bc0c0ca383f78 (diff)
parent478ff799463ca926a8dfbabf058f4e84aaffc65a (diff)
merge 5.7p1
Diffstat (limited to 'defines.h')
-rw-r--r--defines.h48
1 files changed, 47 insertions, 1 deletions
diff --git a/defines.h b/defines.h
index fe25170e6..cd273066d 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.160 2010/04/09 08:13:27 dtucker Exp $ */ 28/* $Id: defines.h,v 1.164 2011/01/17 10:15:31 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -42,6 +42,9 @@ enum
42# define SHUT_RDWR SHUT_RDWR 42# define SHUT_RDWR SHUT_RDWR
43#endif 43#endif
44 44
45/*
46 * Definitions for IP type of service (ip_tos)
47 */
45#ifndef IPTOS_LOWDELAY 48#ifndef IPTOS_LOWDELAY
46# define IPTOS_LOWDELAY 0x10 49# define IPTOS_LOWDELAY 0x10
47# define IPTOS_THROUGHPUT 0x08 50# define IPTOS_THROUGHPUT 0x08
@@ -50,6 +53,40 @@ enum
50# define IPTOS_MINCOST IPTOS_LOWCOST 53# define IPTOS_MINCOST IPTOS_LOWCOST
51#endif /* IPTOS_LOWDELAY */ 54#endif /* IPTOS_LOWDELAY */
52 55
56/*
57 * Definitions for DiffServ Codepoints as per RFC2474
58 */
59#include <netinet/in_systm.h>
60#include <netinet/ip.h>
61#ifndef IPTOS_DSCP_AF11
62# define IPTOS_DSCP_AF11 0x28
63# define IPTOS_DSCP_AF12 0x30
64# define IPTOS_DSCP_AF13 0x38
65# define IPTOS_DSCP_AF21 0x48
66# define IPTOS_DSCP_AF22 0x50
67# define IPTOS_DSCP_AF23 0x58
68# define IPTOS_DSCP_AF31 0x68
69# define IPTOS_DSCP_AF32 0x70
70# define IPTOS_DSCP_AF33 0x78
71# define IPTOS_DSCP_AF41 0x88
72# define IPTOS_DSCP_AF42 0x90
73# define IPTOS_DSCP_AF43 0x98
74# define IPTOS_DSCP_EF 0xb8
75#endif /* IPTOS_DSCP_AF11 */
76#ifndef IPTOS_DSCP_CS0
77# define IPTOS_DSCP_CS0 0x00
78# define IPTOS_DSCP_CS1 0x20
79# define IPTOS_DSCP_CS2 0x40
80# define IPTOS_DSCP_CS3 0x60
81# define IPTOS_DSCP_CS4 0x80
82# define IPTOS_DSCP_CS5 0xa0
83# define IPTOS_DSCP_CS6 0xc0
84# define IPTOS_DSCP_CS7 0xe0
85#endif /* IPTOS_DSCP_CS0 */
86#ifndef IPTOS_DSCP_EF
87# define IPTOS_DSCP_EF 0xb8
88#endif /* IPTOS_DSCP_EF */
89
53#ifndef MAXPATHLEN 90#ifndef MAXPATHLEN
54# ifdef PATH_MAX 91# ifdef PATH_MAX
55# define MAXPATHLEN PATH_MAX 92# define MAXPATHLEN PATH_MAX
@@ -256,6 +293,10 @@ typedef unsigned int size_t;
256# define SIZE_T_MAX UINT_MAX 293# define SIZE_T_MAX UINT_MAX
257#endif /* HAVE_SIZE_T */ 294#endif /* HAVE_SIZE_T */
258 295
296#ifndef SIZE_MAX
297#define SIZE_MAX SIZE_T_MAX
298#endif
299
259#ifndef HAVE_SSIZE_T 300#ifndef HAVE_SSIZE_T
260typedef int ssize_t; 301typedef int ssize_t;
261# define HAVE_SSIZE_T 302# define HAVE_SSIZE_T
@@ -566,6 +607,11 @@ struct winsize {
566# define CUSTOM_SSH_AUDIT_EVENTS 607# define CUSTOM_SSH_AUDIT_EVENTS
567#endif 608#endif
568 609
610#ifdef USE_LINUX_AUDIT
611# define SSH_AUDIT_EVENTS
612# define CUSTOM_SSH_AUDIT_EVENTS
613#endif
614
569#if !defined(HAVE___func__) && defined(HAVE___FUNCTION__) 615#if !defined(HAVE___func__) && defined(HAVE___FUNCTION__)
570# define __func__ __FUNCTION__ 616# define __func__ __FUNCTION__
571#elif !defined(HAVE___func__) 617#elif !defined(HAVE___func__)