From 02a07d07674a53b85bfb91f6b2e7b8b4d5d1e844 Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Wed, 6 Feb 2008 01:03:35 +0000 Subject: [PATCH] fixes some CRLF issues git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@667 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- core/AmSipDialog.cpp | 3 +-- core/AmSipHeaders.h | 2 ++ core/plug-in/session_timer/SessionTimer.cpp | 15 ++++++++------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/core/AmSipDialog.cpp b/core/AmSipDialog.cpp index e999558f..614d8fd4 100644 --- a/core/AmSipDialog.cpp +++ b/core/AmSipDialog.cpp @@ -640,8 +640,7 @@ string AmSipDialog::getRoute() string r_set(""); for(vector::iterator it = route.begin(); it != route.end(); it++) { - - r_set += "Route: " + *it + "\n"; + r_set += SIP_HDR_COLSP(SIP_HDR_ROUTE) + *it + CRLF; } return r_set; diff --git a/core/AmSipHeaders.h b/core/AmSipHeaders.h index 5ff5679c..65c9e2df 100644 --- a/core/AmSipHeaders.h +++ b/core/AmSipHeaders.h @@ -9,6 +9,8 @@ #define SIP_HDR_ROUTE "Route" #define SIP_HDR_CONTENT_TYPE "Content-Type" #define SIP_HDR_CONTACT "Contact" +#define SIP_HDR_SUPPORTED "Supported" +#define SIP_HDR_REQUIRED "Required" #define SIP_HDR_COL(_hdr) _hdr ":" #define SIP_HDR_COLSP(_hdr) SIP_HDR_COL(_hdr) " " diff --git a/core/plug-in/session_timer/SessionTimer.cpp b/core/plug-in/session_timer/SessionTimer.cpp index b037f491..79a49c90 100644 --- a/core/plug-in/session_timer/SessionTimer.cpp +++ b/core/plug-in/session_timer/SessionTimer.cpp @@ -28,6 +28,7 @@ #include "SessionTimer.h" #include "AmUtils.h" #include "UserTimer.h" +#include "AmSipHeaders.h" EXPORT_SESSION_EVENT_HANDLER_FACTORY(SessionTimerFactory, MOD_NAME); @@ -92,12 +93,12 @@ bool SessionTimer::onSendRequest(const string& method, string& hdrs, unsigned int cseq) { - string m_hdrs = "Supported: timer\n"; + string m_hdrs = SIP_HDR_COLSP(SIP_HDR_SUPPORTED) "timer" CRLF; if ((method != "INVITE") && (method != "UPDATE")) goto end; - m_hdrs += "Session-Expires: "+ int2str(session_timer_conf.getSessionExpires()) +"\n" - + "Min-SE: " + int2str(session_timer_conf.getMinimumTimer()) + "\n"; + m_hdrs += "Session-Expires: "+ int2str(session_timer_conf.getSessionExpires()) +CRLF + + "Min-SE: " + int2str(session_timer_conf.getMinimumTimer()) + CRLF; end: hdrs += m_hdrs; @@ -113,17 +114,17 @@ bool SessionTimer::onSendReply(const AmSipRequest& req, //if (!session_timer_conf.getEnableSessionTimer()) // return ""; - string m_hdrs = "Supported: timer\n"; + string m_hdrs = SIP_HDR_COLSP(SIP_HDR_SUPPORTED) "timer" CRLF; if ((req.method != "INVITE") && (req.method != "UPDATE")) return false; // only in 2xx responses to INV/UPD m_hdrs += "Session-Expires: " + int2str(session_interval) + ";refresher="+ - (session_refresher_role==UAC ? "uac":"uas")+"\n"; + (session_refresher_role==UAC ? "uac":"uas")+CRLF; if (((session_refresher_role==UAC) && (session_refresher==refresh_remote)) || ((session_refresher_role==UAS) && remote_timer_aware)) - m_hdrs += "Required: timer\n"; + m_hdrs += SIP_HDR_COLSP(SIP_HDR_REQUIRED) "timer" CRLF; hdrs += m_hdrs; @@ -172,7 +173,7 @@ void SessionTimer::updateTimer(AmSession* s, const AmSipRequest& req) { if((req.method == "INVITE")||(req.method == "UPDATE")){ remote_timer_aware = - key_in_list(getHeader(req.hdrs, "Supported"),"timer"); + key_in_list(getHeader(req.hdrs, SIP_HDR_SUPPORTED),"timer"); // determine session interval string sess_expires_hdr = getHeader(req.hdrs, "Session-Expires", "x");