author | Michael Krelin <hacker@klever.net> | 2007-12-27 00:08:36 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-01-04 18:17:46 (UTC) |
commit | ed6883769a03b36402c2c78b1dcee0c7efeb70bc (patch) (unidiff) | |
tree | ec96f9c7feeb02d2822ec9872b937b54ab82fb8a /include | |
parent | e63de16a9885641b5070ec834225cb562bc2042f (diff) | |
download | libopkele-ed6883769a03b36402c2c78b1dcee0c7efeb70bc.zip libopkele-ed6883769a03b36402c2c78b1dcee0c7efeb70bc.tar.gz libopkele-ed6883769a03b36402c2c78b1dcee0c7efeb70bc.tar.bz2 |
changed auto_ptr to shared_ptr
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | include/Makefile.am | 3 | ||||
-rw-r--r-- | include/opkele/consumer.h | 6 | ||||
-rw-r--r-- | include/opkele/server.h | 4 | ||||
-rw-r--r-- | include/opkele/types.h | 7 |
4 files changed, 10 insertions, 10 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 078c6dc..26cb614 100644 --- a/include/Makefile.am +++ b/include/Makefile.am | |||
@@ -3,17 +3,18 @@ nobase_include_HEADERS = \ | |||
3 | opkele/opkele-config.h \ | 3 | opkele/opkele-config.h \ |
4 | opkele/types.h \ | 4 | opkele/types.h \ |
5 | opkele/association.h \ | 5 | opkele/association.h \ |
6 | opkele/exception.h \ | 6 | opkele/exception.h \ |
7 | opkele/server.h \ | 7 | opkele/server.h \ |
8 | opkele/consumer.h \ | 8 | opkele/consumer.h \ |
9 | opkele/extension.h \ | 9 | opkele/extension.h \ |
10 | opkele/sreg.h \ | 10 | opkele/sreg.h \ |
11 | opkele/extension_chain.h \ | 11 | opkele/extension_chain.h \ |
12 | opkele/xconsumer.h \ | 12 | opkele/xconsumer.h \ |
13 | opkele/xserver.h \ | 13 | opkele/xserver.h \ |
14 | opkele/discovery.h \ | 14 | opkele/discovery.h \ |
15 | opkele/uris.h | 15 | opkele/uris.h \ |
16 | opkele/tr1-mem.h | ||
16 | EXTRA_DIST = \ | 17 | EXTRA_DIST = \ |
17 | opkele/data.h \ | 18 | opkele/data.h \ |
18 | opkele/curl.h opkele/expat.h \ | 19 | opkele/curl.h opkele/expat.h \ |
19 | opkele/util.h | 20 | opkele/util.h |
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 | |||
@@ -22,25 +22,25 @@ namespace opkele { | |||
22 | class consumer_t { | 22 | class consumer_t { |
23 | public: | 23 | public: |
24 | 24 | ||
25 | virtual ~consumer_t() { } | 25 | virtual ~consumer_t() { } |
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 |
43 | * The user is responsible for handling associations expiry and | 43 | * The user is responsible for handling associations expiry and |
44 | * this function should never return an expired or invalidated | 44 | * this function should never return an expired or invalidated |
45 | * association. | 45 | * association. |
46 | * | 46 | * |
@@ -64,45 +64,45 @@ namespace opkele { | |||
64 | * | 64 | * |
65 | * @note | 65 | * @note |
66 | * The user is responsible for handling associations and this | 66 | * The user is responsible for handling associations and this |
67 | * function should never return an expired or invalidated | 67 | * function should never return an expired or invalidated |
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. |
85 | * @param url url to harvest for link tags | 85 | * @param url url to harvest for link tags |
86 | * @param server reference to the string object where to put | 86 | * @param server reference to the string object where to put |
87 | * openid.server value | 87 | * openid.server value |
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 |
105 | * @param return_to the return_to url to pass with the request | 105 | * @param return_to the return_to url to pass with the request |
106 | * @param trust_root the trust root to advertise with the request | 106 | * @param trust_root the trust root to advertise with the request |
107 | * @param ext pointer to an extension(s) hooks object | 107 | * @param ext pointer to an extension(s) hooks object |
108 | * @return the location string | 108 | * @return the location string |
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 | |||
@@ -16,33 +16,33 @@ namespace opkele { | |||
16 | */ | 16 | */ |
17 | class server_t { | 17 | class server_t { |
18 | public: | 18 | public: |
19 | 19 | ||
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 |
45 | * @param identity being verified | 45 | * @param identity being verified |
46 | * @param trust_root presented in the request | 46 | * @param trust_root presented in the request |
47 | * @throw exception if identity can not be confirmed | 47 | * @throw exception if identity can not be confirmed |
48 | */ | 48 | */ |
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 | |||
@@ -1,33 +1,32 @@ | |||
1 | #ifndef __OPKELE_TYPES_H | 1 | #ifndef __OPKELE_TYPES_H |
2 | #define __OPKELE_TYPES_H | 2 | #define __OPKELE_TYPES_H |
3 | 3 | ||
4 | /** | 4 | /** |
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, |
30 | mode_checkid_immediate, | 29 | mode_checkid_immediate, |
31 | mode_checkid_setup, | 30 | mode_checkid_setup, |
32 | mode_check_association | 31 | mode_check_association |
33 | } mode_t; | 32 | } mode_t; |
@@ -99,27 +98,27 @@ namespace opkele { | |||
99 | * check whether the association is stateless. | 98 | * check whether the association is stateless. |
100 | * @return true if stateless | 99 | * @return true if stateless |
101 | */ | 100 | */ |
102 | virtual bool stateless() const = 0; | 101 | virtual bool stateless() const = 0; |
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 | /** |
122 | * check whether the parameter is present. | 121 | * check whether the parameter is present. |
123 | * @param n the parameter name | 122 | * @param n the parameter name |
124 | * @return true if yes | 123 | * @return true if yes |
125 | */ | 124 | */ |