From 13cc6c914604c86c2526f7de9693b194d14c12eb Mon Sep 17 00:00:00 2001
From: Brian West <brian@freeswitch.org>
Date: Thu, 11 Mar 2010 15:52:29 +0000
Subject: [PATCH]  MODENDP-298

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16968 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 src/mod/endpoints/mod_sofia/sofia_presence.c | 26 +++++++++++---------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index c140c84985..0f3dd43d81 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -840,6 +840,7 @@ static int sofia_presence_sub_reg_callback(void *pArg, int argc, char **argv, ch
 	char *host = argv[2];
 	switch_event_t *event;
 	char *event_name = argv[5];
+	char *expires = argv[10];
 
 	if (!strcasecmp(event_name, "message-summary")) {
 		if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_QUERY) == SWITCH_STATUS_SUCCESS) {
@@ -858,6 +859,7 @@ static int sofia_presence_sub_reg_callback(void *pArg, int argc, char **argv, ch
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_type", "presence");
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event_subtype", "probe");
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "proto-specific-event-name", event_name);
+		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "expires", expires);
 		switch_event_fire(&event);
 	}
 
@@ -1779,6 +1781,17 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 			from_host = "n/a";
 		}
 
+		exp_delta = profile->force_subscription_expires ? profile->force_subscription_expires : (sip->sip_expires ? sip->sip_expires->ex_delta : 3600);
+
+		if (exp_delta) {
+			exp_abs = (long) switch_epoch_time_now(NULL) + exp_delta;
+		} else {
+			exp_abs = 0;
+			sub_state = nua_substate_terminated;
+		}
+
+		switch_snprintf(exp_delta_str, sizeof(exp_delta_str), "%ld", exp_delta);
+
 		if (to_user && (strstr(to_user, "ext+") || strstr(to_user, "user+"))) {
 			char protocol[80];
 			char *p;
@@ -1804,6 +1817,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 				switch_event_add_header(sevent, SWITCH_STACK_BOTTOM, "from", "%s@%s", from_user, from_host);
 				switch_event_add_header(sevent, SWITCH_STACK_BOTTOM, "to", "%s@%s", to_user, to_host);
 				switch_event_add_header_string(sevent, SWITCH_STACK_BOTTOM, "proto-specific-event-name", event);
+				switch_event_add_header_string(sevent, SWITCH_STACK_BOTTOM, "expires", exp_delta_str);
 				switch_event_fire(&sevent);
 			}
 		}
@@ -1835,17 +1849,6 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 			sip->sip_expires->ex_delta = 31536000;
 		}
 
-		exp_delta = profile->force_subscription_expires ? profile->force_subscription_expires : (sip->sip_expires ? sip->sip_expires->ex_delta : 3600);
-
-		if (exp_delta) {
-			exp_abs = (long) switch_epoch_time_now(NULL) + exp_delta;
-		} else {
-			exp_abs = 0;
-			sub_state = nua_substate_terminated;
-		}
-
-		switch_snprintf(exp_delta_str, sizeof(exp_delta_str), "%ld", exp_delta);
-
 		if (sofia_test_pflag(profile, PFLAG_MULTIREG)) {
 			sql = switch_mprintf("delete from sip_subscriptions where call_id='%q' "
 								 "or (proto='%q' and sip_user='%q' and sip_host='%q' "
@@ -2007,6 +2010,7 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "event_type", "presence");
 					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "event_subtype", "probe");
 					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "proto-specific-event-name", event);
+					switch_event_add_header_string(pevent, SWITCH_STACK_BOTTOM, "expires", exp_delta_str);
 					switch_event_fire(&pevent);
 				}
 			} else if (!strcasecmp(event, "line-seize")) {