projects
/
mech_eap.orig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make attribute prefix a class method
[mech_eap.orig]
/
util_attr.h
diff --git
a/util_attr.h
b/util_attr.h
index
90a8c91
..
6af4cf3
100644
(file)
--- a/
util_attr.h
+++ b/
util_attr.h
@@
-45,7
+45,8
@@
struct gss_eap_attr_provider;
struct gss_eap_attr_ctx;
typedef bool
struct gss_eap_attr_ctx;
typedef bool
-(*gss_eap_attr_enumeration_cb)(const gss_eap_attr_provider *source,
+(*gss_eap_attr_enumeration_cb)(const gss_eap_attr_ctx *ctx,
+ const gss_eap_attr_provider *source,
const gss_buffer_t attribute,
void *data);
const gss_buffer_t attribute,
void *data);
@@
-125,6
+126,11
@@
public:
{
}
{
}
+ virtual const char *prefix(void) const
+ {
+ return NULL;
+ }
+
virtual void exportToBuffer(gss_buffer_t buffer GSSEAP_UNUSED) const
{
}
virtual void exportToBuffer(gss_buffer_t buffer GSSEAP_UNUSED) const
{
}
@@
-194,12
+200,9
@@
public:
void exportToBuffer(gss_buffer_t buffer) const;
bool initFromBuffer(const gss_buffer_t buffer);
void exportToBuffer(gss_buffer_t buffer) const;
bool initFromBuffer(const gss_buffer_t buffer);
- static unsigned int
- attributePrefixToType(const gss_buffer_t prefix);
-
- static const gss_buffer_t
- attributeTypeToPrefix(unsigned int type);
-
+ static std::string
+ composeAttributeName(const gss_buffer_t prefix,
+ const gss_buffer_t suffix);
static void
decomposeAttributeName(const gss_buffer_t attribute,
gss_buffer_t prefix,
static void
decomposeAttributeName(const gss_buffer_t attribute,
gss_buffer_t prefix,
@@
-208,28
+211,23
@@
public:
composeAttributeName(const gss_buffer_t prefix,
const gss_buffer_t suffix,
gss_buffer_t attribute);
composeAttributeName(const gss_buffer_t prefix,
const gss_buffer_t suffix,
gss_buffer_t attribute);
- static void
+
+ std::string
+ composeAttributeName(unsigned int type,
+ const gss_buffer_t suffix);
+ void
decomposeAttributeName(const gss_buffer_t attribute,
unsigned int *type,
decomposeAttributeName(const gss_buffer_t attribute,
unsigned int *type,
- gss_buffer_t suffix);
-
static
void
+ gss_buffer_t suffix)
const
;
+ void
composeAttributeName(unsigned int type,
const gss_buffer_t suffix,
composeAttributeName(unsigned int type,
const gss_buffer_t suffix,
- gss_buffer_t attribute);
-
- static std::string
- composeAttributeName(const gss_buffer_t prefix,
- const gss_buffer_t suffix);
- static std::string
- composeAttributeName(unsigned int type,
- const gss_buffer_t suffix);
+ gss_buffer_t attribute) const;
gss_eap_attr_provider *getProvider(unsigned int type) const;
gss_eap_attr_provider *getProvider(unsigned int type) const;
- gss_eap_attr_provider *getProvider(const gss_buffer_t prefix) const;
static void
registerProvider(unsigned int type,
static void
registerProvider(unsigned int type,
- const char *prefix,
gss_eap_attr_create_provider factory);
static void
unregisterProvider(unsigned int type);
gss_eap_attr_create_provider factory);
static void
unregisterProvider(unsigned int type);
@@
-241,6
+239,9
@@
private:
bool providerEnabled(unsigned int type) const;
void releaseProvider(unsigned int type);
bool providerEnabled(unsigned int type) const;
void releaseProvider(unsigned int type);
+ unsigned int attributePrefixToType(const gss_buffer_t prefix) const;
+ gss_buffer_desc attributeTypeToPrefix(unsigned int type) const;
+
gss_eap_attr_provider *getPrimaryProvider(void) const;
/* make non-copyable */
gss_eap_attr_provider *getPrimaryProvider(void) const;
/* make non-copyable */