From 94c045b1b30fe95ea0cbe61f358be636700fa9d3 Mon Sep 17 00:00:00 2001 From: Kurtis Heimerl Date: Sun, 11 Nov 2012 10:31:05 +0000 Subject: [PATCH] r4436 in private: Change the order in which RRLP messages are sent. Request, then provide assistance (if needed), then request. git-svn-id: http://wush.net/svn/range/software/public/openbts/trunk@4463 19bc5d8c-e614-43d4-8b26-e1612bc8e597 --- Control/RRLPServer.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Control/RRLPServer.cpp b/Control/RRLPServer.cpp index 3fc9f66..6a676be 100644 --- a/Control/RRLPServer.cpp +++ b/Control/RRLPServer.cpp @@ -277,13 +277,18 @@ bool sendRRLP(GSM::L3MobileIdentity mobileID, GSM::LogicalChannel *LCH) { // Query for RRLP RRLPServer wRRLPServer(mobileID, LCH); - if (!wRRLPServer.assist()) { - LOG(INFO) << "assist problem"; - } - // can still try to check location even if assist didn't work if (!wRRLPServer.locate()) { LOG(INFO) << "locate problem"; - return false; + if (!wRRLPServer.assist()) { + LOG(INFO) << "assist problem"; + // Failure of assist will almost invariably lead to failure in locate. + // Don't even try. It causes too much confusion. + return false; + } + if (!wRRLPServer.locate()) { + LOG(INFO) << "locate problem"; + return false; + } } return true; }