-rw-r--r-- | include/opkele/consumer.h | 6 | ||||
-rw-r--r-- | include/opkele/server.h | 4 | ||||
-rw-r--r-- | include/opkele/types.h | 7 |
3 files changed, 8 insertions, 9 deletions
diff --git a/include/opkele/consumer.h b/include/opkele/consumer.h index c463787..3c1d318 100644 --- a/include/opkele/consumer.h +++ b/include/opkele/consumer.h | |||
@@ -26,17 +26,17 @@ namespace opkele { | |||
26 | 26 | ||
27 | /** | 27 | /** |
28 | * store association. The function should be overridden in the real | 28 | * store association. The function should be overridden in the real |
29 | * implementation to provide persistent associations store. | 29 | * implementation to provide persistent associations store. |
30 | * @param server the OpenID server | 30 | * @param server the OpenID server |
31 | * @param handle association handle | 31 | * @param handle association handle |
32 | * @param secret the secret associated with the server and handle | 32 | * @param secret the secret associated with the server and handle |
33 | * @param expires_in the number of seconds until the handle is expired | 33 | * @param expires_in the number of seconds until the handle is expired |
34 | * @return the auto_ptr<> for the newly allocated association_t object | 34 | * @return the assoc_t for the newly allocated association_t object |
35 | */ | 35 | */ |
36 | virtual assoc_t store_assoc(const string& server,const string& handle,const secret_t& secret,int expires_in) = 0; | 36 | virtual assoc_t store_assoc(const string& server,const string& handle,const secret_t& secret,int expires_in) = 0; |
37 | /** | 37 | /** |
38 | * retrieve stored association. The function should be overridden | 38 | * retrieve stored association. The function should be overridden |
39 | * in the real implementation to provide persistent assocations | 39 | * in the real implementation to provide persistent assocations |
40 | * store. | 40 | * store. |
41 | * | 41 | * |
42 | * @note | 42 | * @note |
@@ -68,17 +68,17 @@ namespace opkele { | |||
68 | * association. | 68 | * association. |
69 | * | 69 | * |
70 | * @note | 70 | * @note |
71 | * It may be a good idea to pre-expire associations shortly before | 71 | * It may be a good idea to pre-expire associations shortly before |
72 | * their time is really up to avoid association expiry in the | 72 | * their time is really up to avoid association expiry in the |
73 | * middle of negotiations. | 73 | * middle of negotiations. |
74 | * | 74 | * |
75 | * @param server the OpenID server | 75 | * @param server the OpenID server |
76 | * @return the auto_ptr<> for the newly allocated association_t object | 76 | * @return the assoc_t for the newly allocated association_t object |
77 | * @throw failed_lookup in case of absence of the handle | 77 | * @throw failed_lookup in case of absence of the handle |
78 | */ | 78 | */ |
79 | virtual assoc_t find_assoc(const string& server); | 79 | virtual assoc_t find_assoc(const string& server); |
80 | 80 | ||
81 | /** | 81 | /** |
82 | * retrieve the metainformation contained in link tags from the | 82 | * retrieve the metainformation contained in link tags from the |
83 | * page pointed by url. the function may implement caching of the | 83 | * page pointed by url. the function may implement caching of the |
84 | * information. | 84 | * information. |
@@ -88,17 +88,17 @@ namespace opkele { | |||
88 | * @param delegate reference to the string object where to put the | 88 | * @param delegate reference to the string object where to put the |
89 | * openid.delegate value (if any) | 89 | * openid.delegate value (if any) |
90 | */ | 90 | */ |
91 | virtual void retrieve_links(const string& url,string& server,string& delegate); | 91 | virtual void retrieve_links(const string& url,string& server,string& delegate); |
92 | 92 | ||
93 | /** | 93 | /** |
94 | * perform the associate request to OpenID server. | 94 | * perform the associate request to OpenID server. |
95 | * @param server the OpenID server | 95 | * @param server the OpenID server |
96 | * @return the auto_ptr<> for the newly allocated association_t | 96 | * @return the assoc_t for the newly allocated association_t |
97 | * object, representing established association | 97 | * object, representing established association |
98 | * @throw exception in case of error | 98 | * @throw exception in case of error |
99 | */ | 99 | */ |
100 | assoc_t associate(const string& server); | 100 | assoc_t associate(const string& server); |
101 | /** | 101 | /** |
102 | * prepare the parameters for the checkid_immediate | 102 | * prepare the parameters for the checkid_immediate |
103 | * request. | 103 | * request. |
104 | * @param identity the identity to verify | 104 | * @param identity the identity to verify |
diff --git a/include/opkele/server.h b/include/opkele/server.h index dd7fc41..3c25646 100644 --- a/include/opkele/server.h +++ b/include/opkele/server.h | |||
@@ -20,25 +20,25 @@ namespace opkele { | |||
20 | virtual ~server_t() { } | 20 | virtual ~server_t() { } |
21 | 21 | ||
22 | /** | 22 | /** |
23 | * allocate the new association. The function should be overridden | 23 | * allocate the new association. The function should be overridden |
24 | * in the real implementation to provide persistent assocations | 24 | * in the real implementation to provide persistent assocations |
25 | * store. | 25 | * store. |
26 | * @param mode the mode of request being processed to base the | 26 | * @param mode the mode of request being processed to base the |
27 | * statelessness of the association upon | 27 | * statelessness of the association upon |
28 | * @return the auto_ptr<> for the newly allocated association_t object | 28 | * @return the assoc_t for the newly allocated association_t object |
29 | */ | 29 | */ |
30 | virtual assoc_t alloc_assoc(mode_t mode) = 0; | 30 | virtual assoc_t alloc_assoc(mode_t mode) = 0; |
31 | /** | 31 | /** |
32 | * retrieve the association. The function should be overridden in | 32 | * retrieve the association. The function should be overridden in |
33 | * the reqal implementation to provide persistent assocations | 33 | * the reqal implementation to provide persistent assocations |
34 | * store. | 34 | * store. |
35 | * @param h association handle | 35 | * @param h association handle |
36 | * @return the auto_ptr<> for the newly allocated association_t object | 36 | * @return the assoc_t for the newly allocated association_t object |
37 | * @throw failed_lookup in case of failure | 37 | * @throw failed_lookup in case of failure |
38 | */ | 38 | */ |
39 | virtual assoc_t retrieve_assoc(const string& h) = 0; | 39 | virtual assoc_t retrieve_assoc(const string& h) = 0; |
40 | 40 | ||
41 | /** | 41 | /** |
42 | * validate the identity. | 42 | * validate the identity. |
43 | * @param assoc association object | 43 | * @param assoc association object |
44 | * @param pin incoming request parameters | 44 | * @param pin incoming request parameters |
diff --git a/include/opkele/types.h b/include/opkele/types.h index ca07df5..d959021 100644 --- a/include/opkele/types.h +++ b/include/opkele/types.h | |||
@@ -5,25 +5,24 @@ | |||
5 | * @file | 5 | * @file |
6 | * @brief various types declarations | 6 | * @brief various types declarations |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <ostream> | 9 | #include <ostream> |
10 | #include <vector> | 10 | #include <vector> |
11 | #include <string> | 11 | #include <string> |
12 | #include <map> | 12 | #include <map> |
13 | #include <memory> | ||
14 | #include <set> | 13 | #include <set> |
14 | #include <opkele/tr1-mem.h> | ||
15 | 15 | ||
16 | namespace opkele { | 16 | namespace opkele { |
17 | using std::vector; | 17 | using std::vector; |
18 | using std::string; | 18 | using std::string; |
19 | using std::map; | 19 | using std::map; |
20 | using std::ostream; | 20 | using std::ostream; |
21 | using std::auto_ptr; | ||
22 | using std::multimap; | 21 | using std::multimap; |
23 | using std::set; | 22 | using std::set; |
24 | 23 | ||
25 | /** | 24 | /** |
26 | * the OpenID operation mode | 25 | * the OpenID operation mode |
27 | */ | 26 | */ |
28 | typedef enum _mode_t { | 27 | typedef enum _mode_t { |
29 | mode_associate, | 28 | mode_associate, |
@@ -103,19 +102,19 @@ namespace opkele { | |||
103 | /** | 102 | /** |
104 | * check whether the association is expired. | 103 | * check whether the association is expired. |
105 | * @return true if expired | 104 | * @return true if expired |
106 | */ | 105 | */ |
107 | virtual bool is_expired() const = 0; | 106 | virtual bool is_expired() const = 0; |
108 | }; | 107 | }; |
109 | 108 | ||
110 | /** | 109 | /** |
111 | * the auto_ptr<> for association_t object type | 110 | * the shared_ptr<> for association_t object type |
112 | */ | 111 | */ |
113 | typedef auto_ptr<association_t> assoc_t; | 112 | typedef tr1mem::shared_ptr<association_t> assoc_t; |
114 | 113 | ||
115 | /** | 114 | /** |
116 | * request/response parameters map | 115 | * request/response parameters map |
117 | */ | 116 | */ |
118 | class params_t : public map<string,string> { | 117 | class params_t : public map<string,string> { |
119 | public: | 118 | public: |
120 | 119 | ||
121 | /** | 120 | /** |