From 60be29f3244a81974629c4b585e11854207e825e Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Wed, 18 Jan 2017 16:03:57 +0800
Subject: [PATCH] fix #750, use specific error code for dns resolve. 2.0.231
---
README.md | 1 +
trunk/src/core/srs_core.hpp | 2 +-
trunk/src/kernel/srs_kernel_error.hpp | 1 +
trunk/src/libs/srs_librtmp.cpp | 2 +-
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index d6eeaee2c..aea4dba52 100755
--- a/README.md
+++ b/README.md
@@ -346,6 +346,7 @@ Remark:
## History
+* v2.0, 2017-01-18, fix [#750][bug #750] use specific error code for dns resolve. 2.0.231
* <strong>v2.0, 2017-01-18, [2.0 beta4(2.0.230)][r2.0b4] released. 86334 lines.</strong>
* v2.0, 2017-01-18, fix [#749][bug #749], timestamp overflow for ATC. 2.0.230
* v2.0, 2017-01-11, fix [#740][bug #740], convert ts aac audio private stream 1 to common. 2.0.229
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index 8e9ce3c78..546c538e4 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 2
#define VERSION_MINOR 0
-#define VERSION_REVISION 230
+#define VERSION_REVISION 231
// generated by configure, only macros.
#include <srs_auto_headers.hpp>
diff --git a/trunk/src/kernel/srs_kernel_error.hpp b/trunk/src/kernel/srs_kernel_error.hpp
index 38b86aa77..15ae8b1ad 100755
--- a/trunk/src/kernel/srs_kernel_error.hpp
+++ b/trunk/src/kernel/srs_kernel_error.hpp
@@ -97,6 +97,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define ERROR_SYSTEM_DIR_EXISTS 1056
#define ERROR_SYSTEM_CREATE_DIR 1057
#define ERROR_SYSTEM_KILL 1058
+#define ERROR_SYSTEM_DNS_RESOLVE 1059
///////////////////////////////////////////////////////
// RTMP protocol error.
diff --git a/trunk/src/libs/srs_librtmp.cpp b/trunk/src/libs/srs_librtmp.cpp
index bf086a652..e22ebc210 100644
--- a/trunk/src/libs/srs_librtmp.cpp
+++ b/trunk/src/libs/srs_librtmp.cpp
@@ -495,7 +495,7 @@ int srs_librtmp_context_resolve_host(Context* context)
// connect to server:port
context->ip = srs_dns_resolve(context->host);
if (context->ip.empty()) {
- return -1;
+ return ERROR_SYSTEM_DNS_RESOLVE;
}
return ret;