From 15457a27d6d6226081b366d14400e3e32bb39159 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Thu, 25 Sep 2008 12:34:45 -0400
Subject: [PATCH] use pjsip macros for status code
---
src/sipmanager.cpp | 8 ++++----
src/sipmanager.h | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/sipmanager.cpp b/src/sipmanager.cpp
index aad549a17c..522daa3b9e 100755
--- a/src/sipmanager.cpp
+++ b/src/sipmanager.cpp
@@ -179,7 +179,7 @@ pj_status_t SIPManager::sipInit() {
PJ_ASSERT_RETURN( status == PJ_SUCCESS, 1 );
// Init presence module.
- // TODO We probably do need that extension
+ // TODO We probably do not need that extension
status = pjsip_pres_init_module(_endpt, pjsip_evsub_instance());
PJ_ASSERT_RETURN( status == PJ_SUCCESS, 1 );
@@ -645,7 +645,7 @@ pj_bool_t SIPManager::mod_on_rx_request(pjsip_rx_data *rdata) {
if (rdata->msg_info.msg->line.req.method.id != PJSIP_INVITE_METHOD) {
if (rdata->msg_info.msg->line.req.method.id != PJSIP_ACK_METHOD) {
pj_strdup2(getInstance()->getAppPool(), &reason, "user agent unable to handle this request ");
- pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, MSG_METHOD_NOT_ALLOWED, &reason, NULL,
+ pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, PJSIP_SC_METHOD_NOT_ALLOWED, &reason, NULL,
NULL);
return PJ_TRUE;
}
@@ -655,7 +655,7 @@ pj_bool_t SIPManager::mod_on_rx_request(pjsip_rx_data *rdata) {
status = pjsip_inv_verify_request(rdata, &options, NULL, NULL, getInstance()->getEndPoint(), NULL);
if (status != PJ_SUCCESS) {
pj_strdup2(getInstance()->getAppPool(), &reason, "user agent unable to handle this INVITE ");
- pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, MSG_METHOD_NOT_ALLOWED, &reason, NULL,
+ pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, PJSIP_SC_METHOD_NOT_ALLOWED, &reason, NULL,
NULL);
return PJ_TRUE;
}
@@ -718,7 +718,7 @@ pj_bool_t SIPManager::mod_on_rx_request(pjsip_rx_data *rdata) {
/* Create the local dialog (UAS) */
status = pjsip_dlg_create_uas(pjsip_ua_instance(), rdata, NULL, &dialog);
if (status != PJ_SUCCESS) {
- pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, MSG_SERVER_INTERNAL_ERROR, &reason, NULL,
+ pjsip_endpt_respond_stateless(getInstance()->getEndPoint(), rdata, PJSIP_SC_INTERNAL_SERVER_ERROR, &reason, NULL,
NULL);
return PJ_TRUE;
}
diff --git a/src/sipmanager.h b/src/sipmanager.h
index a40ca3b54d..577b3f5540 100755
--- a/src/sipmanager.h
+++ b/src/sipmanager.h
@@ -25,17 +25,16 @@
#include <pjlib-util.h>
#include <pjlib.h>
#include <pjnath/stun_config.h>
+
+//TODO Remove this include if we don't need anything from it
#include <pjsip_simple.h>
+
#include <pjsip_ua.h>
#include <pjmedia/sdp.h>
#include <pjmedia/sdp_neg.h>
#include <string>
#include <vector>
-#define MSG_OK 200
-#define MSG_METHOD_NOT_ALLOWED 405
-#define MSG_NOT_ACCEPTABLE_HERE 488
-#define MSG_SERVER_INTERNAL_ERROR 500
#define PJ_LOG_LEVEL 5
--
GitLab