SourceFormat Enforcement

[thirdparty/squid.git] / include / snmp_impl.h

diff --git a/include/snmp_impl.h b/include/snmp_impl.h
index c1dfcb83994afacaec1698418b843f9c71bd7075..4e598239f0d34e04db7208fffd619383054234c4 100644 (file)
--- a/include/snmp_impl.h
+++ b/include/snmp_impl.h
@@ -1,27 +1,33 @@
 /*
- * $Id: snmp_impl.h,v 1.12 2001/10/08 16:18:31 hno Exp $
+ * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ *
+ * Squid software is distributed under GPLv2+ license and includes
+ * contributions from numerous individuals and organizations.
+ * Please see the COPYING and CONTRIBUTORS files for details.
  */
 
 #ifndef SQUID_SNMP_IMPL_H
 #define SQUID_SNMP_IMPL_H
 
+#include "asn1.h"
+
 /*
  * Definitions for SNMP (RFC 1067) implementation.
  *
  *
  */
 /***********************************************************
-       Copyright 1988, 1989 by Carnegie Mellon University
+    Copyright 1988, 1989 by Carnegie Mellon University
 
                       All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the name of CMU not be
 used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
+software without specific, written prior permission.
 
 CMU DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
 ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -44,46 +50,19 @@ SOFTWARE.
 #endif
 #endif
 
-/*
- * Error codes:
- */
-/*
- * These must not clash with SNMP error codes (all positive).
- */
-#define PARSE_ERROR    -1
-#define BUILD_ERROR    -2
-
-#define SID_MAX_LEN    64
-
-#ifndef NULL
-#define NULL 0
-#endif
-
-#ifndef TRUE
-#define TRUE   1
-#endif
-#ifndef FALSE
-#define FALSE  0
-#endif
+#define SID_MAX_LEN 64
 
-#define READ       1
-#define WRITE      0
+#define READ        1
+#define WRITE       0
 
 #define SNMP_RESERVE1    0
 #define SNMP_RESERVE2    1
 #define SNMP_COMMIT      2
 #define SNMP_FREE        3
 
-#define RONLY  0xAAAA          /* read access for everyone */
-#define RWRITE 0xAABA          /* add write access for community private */
-#define NOACCESS 0x0000                /* no access for anybody */
-
-#ifndef INTEGER
-#define INTEGER            ASN_INTEGER
-#define STRING     ASN_OCTET_STR
-#define OBJID      ASN_OBJECT_ID
-#define NULLOBJ            ASN_NULL
-#endif
+#define RONLY   0xAAAA      /* read access for everyone */
+#define RWRITE  0xAABA      /* add write access for community private */
+#define NOACCESS 0x0000     /* no access for anybody */
 
 struct trapVar {
     oid *varName;
@@ -94,7 +73,5 @@ struct trapVar {
     struct trapVar *next;
 };
 
-/* from snmp.c */
-extern u_char sid[];           /* size SID_MAX_LEN */
-
 #endif /* SQUID_SNMP_IMPL_H */
+