parse ProviderID while doing discovery

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

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/discovery.cc b/lib/discovery.cc
index bc7d6fb..81727c0 100644
--- a/lib/discovery.cc
+++ b/lib/discovery.cc
@@ -215,85 +215,91 @@ namespace opkele {
 			html_start_element(n,a);
 		    ++skipping; return;
 		}
 		if(pt_stack.empty()) {
 		    if(is_qelement(n,NSURI_XRDS "\tXRDS"))
 			return;
 		    if(is_qelement(n,NSURI_XRD "\tXRD")) {
 			assert(xrd);
 			xrd->clear();
 			pt_stack.push_back(n);
 		    }else if(xmode&xmode_html) {
 			html_start_element(n,a);
 		    }else{
 			skipping = -1;
 		    }
 		}else{
 		    int pt_s = pt_stack.size();
 		    if(pt_s==1) {
 			if(is_qelement(n,NSURI_XRD "\tCanonicalID")) {
 			    assert(xrd);
 			    cdata = &(xrd->canonical_ids.add(element_priority(a),string()));
 			}else if(is_qelement(n,NSURI_XRD "\tLocalID")) {
 			    assert(xrd);
 			    cdata = &(xrd->local_ids.add(element_priority(a),string()));
+			}else if(is_qelement(n,NSURI_XRD "\tProviderID")) {
+			    assert(xrd);
+			    cdata = &(xrd->provider_id);
 			}else if(is_qelement(n,NSURI_XRD "\tService")) {
 			    assert(xrd);
 			    xrd_service = &(xrd->services.add(element_priority(a),
 					service_t()));
 			    pt_stack.push_back(n);
 			}else if(is_qelement(n,NSURI_XRD "\tStatus")) {
 			    for(;*a;) {
 				if(!strcasecmp(*(a++),"code")) {
 				    if(sscanf(*(a++),"%ld",&status_code)==1 && status_code!=100) {
 					cdata = &status_string;
 					pt_stack.push_back(n);
 					break;
 				    }
 				}
 			    }
 			}else if(is_qelement(n,NSURI_XRD "\tExpires")) {
 			    assert(xrd);
 			    cdata_buf.clear();
 			    cdata = &cdata_buf;
 			}else if(xmode&xmode_html) {
 			    html_start_element(n,a);
 			}else{
 			    skipping = 1;
 			}
 		    }else if(pt_s==2) {
 			if(is_qelement(pt_stack.back().c_str(), NSURI_XRD "\tService")) {
 			    if(is_qelement(n,NSURI_XRD "\tType")) {
 				assert(xrd); assert(xrd_service);
 				cdata_buf.clear();
 				cdata = &cdata_buf;
 			    }else if(is_qelement(n,NSURI_XRD "\tURI")) {
 				assert(xrd); assert(xrd_service);
 				cdata = &(xrd_service->uris.add(element_priority(a),string()));
 			    }else if(is_qelement(n,NSURI_XRD "\tLocalID")
 				    || is_qelement(n,NSURI_OPENID10 "\tDelegate") ) {
 				assert(xrd); assert(xrd_service);
 				cdata = &(xrd_service->local_ids.add(element_priority(a),string()));
+			    }else if(is_qelement(n,NSURI_XRD "\tProviderID")) {
+				    assert(xrd); assert(xrd_service);
+				    cdata = &(xrd_service->provider_id);
 			    }else{
 				skipping = 1;
 			    }
 			}else
 			    skipping = 1;
 		    }else if(xmode&xmode_html) {
 			html_start_element(n,a);
 		    }else{
 			skipping = 1;
 		    }
 		}
 	    }
 	    void end_element(const XML_Char *n) {
 		if(skipping<0) return;
 		if(skipping) {
 		    --skipping; return;
 		}
 		if(is_qelement(n,NSURI_XRD "\tType")) {
 		    assert(xrd); assert(xrd_service); assert(cdata==&cdata_buf);
 		    xrd_service->types.insert(cdata_buf);
 		}else if(is_qelement(n,NSURI_XRD "\tService")) {
 		    assert(xrd); assert(xrd_service);
 		    assert(!pt_stack.empty());
 		    assert(pt_stack.back()==(NSURI_XRD "\tService"));