use JSON instead of DDF marshalling

[mech_eap.orig] / util_radius.h

diff --git a/util_radius.h b/util_radius.h
index 216962a..656f1b7 100644 (file)
--- a/util_radius.h
+++ b/util_radius.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, JANET(UK)
+ * Copyright (c) 2011, JANET(UK)
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,10 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * RADIUS attribute provider.
+ */
+
 #ifndef _UTIL_RADIUS_H_
 #define _UTIL_RADIUS_H_ 1
 
@@ -47,10 +51,10 @@ public:
                             const gss_ctx_id_t ctx);
 
     bool getAttributeTypes(gss_eap_attr_enumeration_cb, void *data) const;
-    void setAttribute(int complete,
+    bool setAttribute(int complete,
                       const gss_buffer_t attr,
                       const gss_buffer_t value);
-    void deleteAttribute(const gss_buffer_t value);
+    bool deleteAttribute(const gss_buffer_t attr);
     bool getAttribute(const gss_buffer_t attr,
                       int *authenticated,
                       int *complete,
@@ -62,9 +66,11 @@ public:
     void releaseAnyNameMapping(gss_buffer_t type_id,
                                gss_any_t input) const;
 
-    void exportToBuffer(gss_buffer_t buffer) const;
-    bool initFromBuffer(const gss_eap_attr_ctx *ctx,
-                        const gss_buffer_t buffer);
+    const char *prefix(void) const;
+    const char *name(void) const;
+    bool initWithJsonObject(const gss_eap_attr_ctx *manager,
+                           json_t *obj);
+    json_t *jsonRepresentation(void) const;
 
     bool getAttribute(uint32_t attribute,
                       int *authenticated,
@@ -79,6 +85,10 @@ public:
                       gss_buffer_t value,
                       gss_buffer_t display_value,
                       int *more) const;
+    bool setAttribute(int complete,
+                      uint32_t attribute,
+                      const gss_buffer_t value);
+    bool deleteAttribute(uint32_t attribute);
 
     bool getFragmentedAttribute(uint16_t attribute,
                                 uint16_t vendor,
@@ -96,15 +106,12 @@ public:
     static gss_eap_attr_provider *createAttrContext(void);
 
 private:
-    bool allocRadHandle(const std::string &configFile);
     const VALUE_PAIR *getAvps(void) const {
         return m_vps;
     }
 
-    struct rs_handle *m_rh;
     VALUE_PAIR *m_vps;
     bool m_authenticated;
-    std::string m_configFile;
 };
 
 /* For now */
@@ -113,11 +120,10 @@ extern "C" {
 
 OM_uint32
 gssEapRadiusAddAvp(OM_uint32 *minor,
-                   struct rs_handle *rh,
                    VALUE_PAIR **vp,
                    uint16_t type,
                    uint16_t vendor,
-                   gss_buffer_t buffer);
+                   const gss_buffer_t buffer);
 
 OM_uint32
 gssEapRadiusGetAvp(OM_uint32 *minor,
@@ -141,16 +147,10 @@ OM_uint32 gssEapRadiusAttrProviderInit(OM_uint32 *minor);
 OM_uint32 gssEapRadiusAttrProviderFinalize(OM_uint32 *minor);
 
 OM_uint32
-gssEapRadiusAllocConn(OM_uint32 *minor,
-                      const gss_cred_id_t cred,
-                      gss_ctx_id_t ctx);
-
-OM_uint32
 gssEapRadiusMapError(OM_uint32 *minor,
                      struct rs_error *err);
 
 #define RS_CONFIG_FILE      SYSCONFDIR "/radsec.conf"
-#define RS_DICT_FILE        DATAROOTDIR "/freeradius/dictionary"
 
 #define VENDORPEC_MS                        311 /* RFC 2548 */
 
@@ -165,6 +165,9 @@ gssEapRadiusMapError(OM_uint32 *minor,
 #define PW_GSS_ACCEPTOR_REALM_NAME          131
 #define PW_SAML_AAA_ASSERTION               132
 
+#define IS_RADIUS_ERROR(code)               ((code) >= ERROR_TABLE_BASE_rse && \
+                                             (code) <= ERROR_TABLE_BASE_rse + RSE_TIMEOUT_IO)
+
 #ifdef __cplusplus
 }
 #endif