a few changes to the infrastructure

* added mode_unknown to the mode_t enumeration
* add to_keyvalues(ostream&) to openid message class
* fixed openid_message_t::set_field for the case of overwriting

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 2 insertions, 0 deletions

diff --git a/include/opkele/types.h b/include/opkele/types.h
index d5ad258..842a722 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -9,48 +9,49 @@
 #include <ostream>
 #include <vector>
 #include <string>
 #include <map>
 #include <set>
 #include <list>
 #include <opkele/iterator.h>
 #include <opkele/tr1-mem.h>
 
 namespace opkele {
     using std::vector;
     using std::string;
     using std::map;
     using std::ostream;
     using std::multimap;
     using std::set;
     using std::list;
     using std::iterator;
     using std::forward_iterator_tag;
 
     /**
      * the OpenID operation mode
      */
     typedef enum _mode_t {
+	mode_unknown = 0,
 	mode_associate,
 	mode_checkid_immediate,
 	mode_checkid_setup,
 	mode_check_association
     } mode_t;
 
     /**
      * the association secret container
      */
     class secret_t : public vector<unsigned char> {
 	public:
 
 	    /**
 	     * xor the secret and hmac together and encode, using base64
 	     * @param key_d pointer to the message digest
 	     * @param rv reference to the return value
 	     */
 	    void enxor_to_base64(const unsigned char *key_d,string& rv) const;
 	    /**
 	     * decode base64-encoded secret and xor it with the message digest
 	     * @param key_d pointer to the message digest
 	     * @param b64 base64-encoded secret value
 	     */
 	    void enxor_from_base64(const unsigned char *key_d,const string& b64);
@@ -124,48 +125,49 @@ namespace opkele {
 		> fields_iterator;
 
 	    basic_openid_message() { }
 	    basic_openid_message(const basic_openid_message& x);
 	    void copy_to(basic_openid_message& x) const;
 
 	    virtual bool has_field(const string& n) const = 0;
 	    virtual const string& get_field(const string& n) const = 0;
 
 	    virtual bool has_ns(const string& uri) const;
 	    virtual string get_ns(const string& uri) const;
 
 	    virtual fields_iterator fields_begin() const = 0;
 	    virtual fields_iterator fields_end() const = 0;
 
 	    virtual string append_query(const string& url) const;
 	    virtual string query_string() const;
 
 
 	    virtual void reset_fields();
 	    virtual void set_field(const string& n,const string& v);
 	    virtual void reset_field(const string& n);
 
 	    virtual void from_keyvalues(const string& kv);
+	    virtual void to_keyvalues(ostream& o) const;
 
 	    void add_to_signed(const string& fields);
 	    string find_ns(const string& uri,const char *pfx) const;
 	    string allocate_ns(const string& uri,const char *pfx);
     };
 
     class openid_message_t : public basic_openid_message, public map<string,string> {
 	public:
 	    openid_message_t() { }
 	    openid_message_t(const basic_openid_message& x)
 		: basic_openid_message(x) { }
 
 	    void copy_to(basic_openid_message& x) const;
 
 	    bool has_field(const string& n) const;
 	    const string& get_field(const string& n) const;
 	    virtual fields_iterator fields_begin() const;
 	    virtual fields_iterator fields_end() const;
 
 	    void reset_fields();
 	    void set_field(const string& n,const string& v);
 	    void reset_field(const string& n);
     };