Merge 6a35a1163a into 5cb74797fe

New function, `void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)` has been added to mod_pgsql module. This function is now called at several points where an error occurred but *err was not yet set.

src/mod/databases/mod_pgsql/mod_pgsql.c

@@ -106,6 +106,22 @@ char * pgsql_handle_get_error(switch_pgsql_handle_t *handle)
 	return err_str;
 }
 
+void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)
+{
+	char *err_str;
+
+	if (err && !(*err)) {
+		err_str = pgsql_handle_get_error(handle);
+
+		if (zstr(err_str)) {
+			switch_safe_free(err_str);
+			err_str = strdup((char *)"SQL ERROR!");
+		}
+
+		*err = err_str;
+	}
+}
+
 static int db_is_up(switch_pgsql_handle_t *handle)
 {
 	int ret = 0;
@@ -553,8 +569,15 @@ switch_status_t pgsql_handle_exec_detailed(const char *file, const char *func, i
 		goto error;
 	}
 
-	return pgsql_finish_results(handle);
+	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		goto error;
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+
 error:
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }
 
@@ -630,6 +653,7 @@ done:
 
 	pgsql_free_result(&result);
 	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		pgsql_handle_set_error_if_not_set(handle, err);
 		sstatus = SWITCH_STATUS_FALSE;
 	}
 
@@ -638,6 +662,7 @@ done:
 error:
 
 	pgsql_free_result(&result);
+	pgsql_handle_set_error_if_not_set(handle, err);
 
 	return SWITCH_STATUS_FALSE;
 }
@@ -1050,6 +1075,8 @@ switch_status_t pgsql_handle_callback_exec_detailed(const char *file, const char
 	return SWITCH_STATUS_SUCCESS;
 error:
 
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }
 

src/mod/endpoints/mod_sofia/sofia_glue.c

@@ -1303,7 +1303,24 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session)
 
 		if (zstr(tech_pvt->invite_contact)) {
 			const char *contact;
-			if ((contact = switch_channel_get_variable(channel, "sip_contact_user"))) {
+			const char *contactHost;
+			if ((contact = switch_channel_get_variable(channel, "sip_contact_user")) && (contactHost = switch_channel_get_variable(channel, "sip_contact_host"))) {
+                                if (sofia_glue_transport_has_tls(tech_pvt->transport)) {
+                                        tech_pvt->invite_contact = switch_core_session_sprintf(session, "sip:%s@%s:%d", contact,
+                                                                                                                                                   contactHost, tech_pvt->profile->tls_sip_port);
+                                } else {
+                                        tech_pvt->invite_contact = switch_core_session_sprintf(session, "sip:%s@%s:%d", contact,
+                                                                                                                                                   contactHost, tech_pvt->profile->extsipport);
+                                }
+                        } else if ((contactHost = switch_channel_get_variable(channel, "sip_contact_host"))) {
+				if (sofia_glue_transport_has_tls(tech_pvt->transport)) {
+                                        tech_pvt->invite_contact = switch_core_session_sprintf(session, "sip:mod_sofia@%s:%d", contactHost,
+                                                                                                                                                   tech_pvt->profile->tls_sip_port);
+                                } else {
+                                        tech_pvt->invite_contact = switch_core_session_sprintf(session, "sip:mod_sofia@%s:%d", contactHost,
+                                                                                                                                                   tech_pvt->profile->extsipport);
+                                }
+			} else if ((contact = switch_channel_get_variable(channel, "sip_contact_user"))) {
 				char *ip_addr = tech_pvt->profile->sipip;
 				char *ipv6;