1 files changed, 24 insertions, 4 deletions

diff --git a/lib/sreg.cc b/lib/sreg.cc
index 7e2d588..b40cd45 100644
--- a/lib/sreg.cc
+++ b/lib/sreg.cc
@@ -30,3 +30,3 @@ namespace opkele {
 
-    void sreg_t::checkid_hook(basic_openid_message& om) {
+    void sreg_t::rp_checkid_hook(basic_openid_message& om) {
         string fr, fo;
@@ -48,3 +48,7 @@ namespace opkele {
 
-    void sreg_t::id_res_hook(const basic_openid_message& om,const basic_openid_message& sp) {
+    void sreg_t::checkid_hook(basic_openid_message& om) {
+        rp_checkid_hook(om); }
+
+    void sreg_t::rp_id_res_hook(const basic_openid_message& om,
+            const basic_openid_message& sp) {
         clear();
@@ -69,2 +73,6 @@ namespace opkele {
 
+    void sreg_t::id_res_hook(const basic_openid_message& om,
+            const basic_openid_message& sp) {
+        rp_id_res_hook(om,sp); }
+
     const string& sreg_t::get_field(fieldbit_t fb) const {
@@ -107,3 +115,3 @@ namespace opkele {
 
-    void sreg_t::checkid_hook(const basic_openid_message& inm,basic_openid_message& oum) {
+    void sreg_t::op_checkid_hook(const basic_openid_message& inm) {
         string ins = inm.find_ns(OIURI_SREG11,"sreg");
@@ -122,3 +130,5 @@ namespace opkele {
         }catch(failed_lookup&) { }
-        setup_response(inm,oum);
+    }
+
+    void sreg_t::op_id_res_hook(basic_openid_message& oum) {
         string ons = oum.allocate_ns(OIURI_SREG11,"sreg");
@@ -136,3 +146,13 @@ namespace opkele {
 
+    void sreg_t::checkid_hook(const basic_openid_message& inm,
+            basic_openid_message& oum) {
+        op_checkid_hook(inm);
+        setup_response(inm,oum);
+        op_id_res_hook(oum);
+    }
+
     void sreg_t::setup_response(const basic_openid_message& /* inm */,basic_openid_message& /* oum */) {
+        setup_response();
+    }
+    void sreg_t::setup_response() {
         fields_response = (fields_required|fields_optional)&has_fields;