[sr-dev] git:pd/outbound: modules/registrar: updated for parse_supported refactoring

[Peter Dunkley]

Module: sip-router
Branch: pd/outbound
Commit: 6c24a8dfa84d1e92fdd53e4c8c2bd7bc1715ceb5
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c24a8dfa84d1e92fdd53e4c8c2bd7bc1715ceb5

Author: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Date:   Wed Feb 27 14:02:05 2013 +0000

modules/registrar: updated for parse_supported refactoring

---

 modules/registrar/reply.c |    8 ++++----
 modules/registrar/save.c  |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c
index 5903710..97c8274 100644
--- a/modules/registrar/reply.c
+++ b/modules/registrar/reply.c
@@ -188,7 +188,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host)
 
 
 	if(msg!=NULL && parse_supported(msg)==0
-			&& (get_supported(msg) & F_SUPPORTED_GRUU))
+			&& (get_supported(msg) & F_OPTION_TAG_GRUU))
 		mode = 1;
 	else
 		mode = 0;
@@ -610,8 +610,8 @@ static int add_flow_timer(struct sip_msg* _m)
  */
 int reg_send_reply(struct sip_msg* _m)
 {
-	str unsup = str_init(SUPPORTED_PATH_STR);
-	str outbound_str = str_init(SUPPORTED_OUTBOUND_STR);
+	str unsup = str_init(OPTION_TAG_PATH_STR);
+	str outbound_str = str_init(OPTION_TAG_OUTBOUND_STR);
 	long code;
 	str msg = str_init(MSG_200); /* makes gcc shut up */
 	char* buf;
@@ -632,7 +632,7 @@ int reg_send_reply(struct sip_msg* _m)
 					if (add_path(_m, &_m->path_vec) < 0)
 						return -1;
 				}
-				else if (get_supported(_m) & F_SUPPORTED_PATH) {
+				else if (get_supported(_m) & F_OPTION_TAG_PATH) {
 					if (add_path(_m, &_m->path_vec) < 0)
 						return -1;
 				} else if (path_mode == PATH_MODE_STRICT) {
diff --git a/modules/registrar/save.c b/modules/registrar/save.c
index 7596c6a..9cc2dd4 100644
--- a/modules/registrar/save.c
+++ b/modules/registrar/save.c
@@ -843,8 +843,8 @@ int save(struct sip_msg* _m, udomain_t* _d, int _cflags, str *_uri)
 	}
 
 	if (parse_supported(_m) == 0) {
-		if (!(((struct supported_body *)_m->supported->parsed)->supported_all
-				& F_SUPPORTED_OUTBOUND) && reg_outbound_mode == REG_OUTBOUND_REQUIRE) {
+		if (!(((struct option_tag_body *)_m->supported->parsed)->option_tags_all
+				& F_OPTION_TAG_OUTBOUND) && reg_outbound_mode == REG_OUTBOUND_REQUIRE) {
 			LM_WARN("Outbound required by server and not supported by UAC\n");
 			rerrno = R_OB_UNSUP;
 			goto error;