Merge pull request #366 from pali/rtnetlink-register

[ppp.git] / pppd / plugins / radius / radiusclient.h

diff --git a/pppd/plugins/radius/radiusclient.h b/pppd/plugins/radius/radiusclient.h
index c3a8e7abb21332e1eb97a7f7b498bb77cddd24be..777e1205843a17eb1578de8755cfe2b764facdc2 100644 (file)
--- a/pppd/plugins/radius/radiusclient.h
+++ b/pppd/plugins/radius/radiusclient.h
@@ -17,10 +17,10 @@
 #ifndef RADIUSCLIENT_H
 #define RADIUSCLIENT_H
 
-#include       <sys/types.h>
-#include       <stdio.h>
-#include       <time.h>
-#include "pppd.h"
+#include <sys/types.h>
+#include <stdio.h>
+#include <time.h>
+#include <pppd/pppd.h>
 
 #ifndef _UINT4_T
 /* This works for all machines that Linux runs on... */
@@ -31,7 +31,7 @@ typedef int          INT4;
 #define AUTH_VECTOR_LEN                16
 #define AUTH_PASS_LEN          (3 * 16) /* multiple of 16 */
 #define AUTH_ID_LEN            64
-#define AUTH_STRING_LEN                128      /* maximum of 253 */
+#define AUTH_STRING_LEN                253      /* maximum of 253 */
 
 #define        BUFFER_LEN              8192
 
@@ -77,6 +77,17 @@ typedef struct pw_auth_hdr
 #define PW_TYPE_INTEGER                        1
 #define PW_TYPE_IPADDR                 2
 #define PW_TYPE_DATE                   3
+#define PW_TYPE_ABINARY                        4
+#define PW_TYPE_OCTETS                 5
+#define PW_TYPE_IFID                   6
+#define PW_TYPE_IPV6ADDR               7
+#define PW_TYPE_IPV6PREFIX             8
+#define PW_TYPE_BYTE                   9
+#define PW_TYPE_SHORT                  10
+#define PW_TYPE_ETHERNET               11
+#define PW_TYPE_SIGNED                 12
+#define PW_TYPE_COMBO_IP               13
+#define PW_TYPE_TLV                    14
 
 /* standard RADIUS codes */
 
@@ -173,6 +184,8 @@ typedef struct pw_auth_hdr
 #define PW_ACCT_LINK_COUNT             51      /* integer */
 
 /* From RFC 2869 */
+#define PW_ACCT_INPUT_GIGAWORDS         52     /* integer */
+#define PW_ACCT_OUTPUT_GIGAWORDS        53     /* integer */
 #define PW_ACCT_INTERIM_INTERVAL        85     /* integer */
 
 /*     Merit Experimental Extensions */
@@ -455,6 +468,6 @@ void rc_mdelay(int);
 
 /* md5.c                       */
 
-void rc_md5_calc(unsigned char *, unsigned char *, unsigned int);
+int rc_md5_calc(unsigned char *out, const unsigned char *in, unsigned int inl);
 
 #endif /* RADIUSCLIENT_H */