fix the bug by refine code, rename the get_perfer_cid to get_prefer_cid.

@@ -1879,7 +1879,7 @@ int SrsConnectAppPacket::decode(SrsStream* stream)
     return ret;
     return ret;
 }
 }
 
 
-int SrsConnectAppPacket::get_perfer_cid()
+int SrsConnectAppPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverConnection;
     return RTMP_CID_OverConnection;
 }
 }
@@ -1993,7 +1993,7 @@ int SrsConnectAppResPacket::decode(SrsStream* stream)
     return ret;
     return ret;
 }
 }
 
 
-int SrsConnectAppResPacket::get_perfer_cid()
+int SrsConnectAppResPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverConnection;
     return RTMP_CID_OverConnection;
 }
 }
@@ -2105,7 +2105,7 @@ int SrsCallPacket::decode(SrsStream* stream)
     return ret;
     return ret;
 }
 }
 
 
-int SrsCallPacket::get_perfer_cid()
+int SrsCallPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverConnection;
     return RTMP_CID_OverConnection;
 }
 }
@@ -2179,7 +2179,7 @@ SrsCallResPacket::~SrsCallResPacket()
     srs_freep(response);
     srs_freep(response);
 }
 }
 
 
-int SrsCallResPacket::get_perfer_cid()
+int SrsCallResPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverConnection;
     return RTMP_CID_OverConnection;
 }
 }
@@ -2282,7 +2282,7 @@ int SrsCreateStreamPacket::decode(SrsStream* stream)
     return ret;
     return ret;
 }
 }
 
 
-int SrsCreateStreamPacket::get_perfer_cid()
+int SrsCreateStreamPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverConnection;
     return RTMP_CID_OverConnection;
 }
 }
@@ -2373,7 +2373,7 @@ int SrsCreateStreamResPacket::decode(SrsStream* stream)
     return ret;
     return ret;
 }
 }
 
 
-int SrsCreateStreamResPacket::get_perfer_cid()
+int SrsCreateStreamResPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverConnection;
     return RTMP_CID_OverConnection;
 }
 }
@@ -2509,7 +2509,7 @@ int SrsFMLEStartPacket::decode(SrsStream* stream)
     return ret;
     return ret;
 }
 }
 
 
-int SrsFMLEStartPacket::get_perfer_cid()
+int SrsFMLEStartPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverConnection;
     return RTMP_CID_OverConnection;
 }
 }
@@ -2630,7 +2630,7 @@ int SrsFMLEStartResPacket::decode(SrsStream* stream)
     return ret;
     return ret;
 }
 }
 
 
-int SrsFMLEStartResPacket::get_perfer_cid()
+int SrsFMLEStartResPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverConnection;
     return RTMP_CID_OverConnection;
 }
 }
@@ -2733,7 +2733,7 @@ int SrsPublishPacket::decode(SrsStream* stream)
     return ret;
     return ret;
 }
 }
 
 
-int SrsPublishPacket::get_perfer_cid()
+int SrsPublishPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverStream;
     return RTMP_CID_OverStream;
 }
 }
@@ -2931,7 +2931,7 @@ int SrsPlayPacket::decode(SrsStream* stream)
     return ret;
     return ret;
 }
 }
 
 
-int SrsPlayPacket::get_perfer_cid()
+int SrsPlayPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverStream;
     return RTMP_CID_OverStream;
 }
 }
@@ -3014,7 +3014,7 @@ SrsPlayResPacket::~SrsPlayResPacket()
     srs_freep(desc);
     srs_freep(desc);
 }
 }
 
 
-int SrsPlayResPacket::get_perfer_cid()
+int SrsPlayResPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverStream;
     return RTMP_CID_OverStream;
 }
 }
@@ -3076,7 +3076,7 @@ SrsOnBWDonePacket::~SrsOnBWDonePacket()
     srs_freep(args);
     srs_freep(args);
 }
 }
 
 
-int SrsOnBWDonePacket::get_perfer_cid()
+int SrsOnBWDonePacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverConnection;
     return RTMP_CID_OverConnection;
 }
 }
@@ -3133,7 +3133,7 @@ SrsOnStatusCallPacket::~SrsOnStatusCallPacket()
     srs_freep(data);
     srs_freep(data);
 }
 }
 
 
-int SrsOnStatusCallPacket::get_perfer_cid()
+int SrsOnStatusCallPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverStream;
     return RTMP_CID_OverStream;
 }
 }
@@ -3229,7 +3229,7 @@ int SrsBandwidthPacket::decode(SrsStream *stream)
     return ret;
     return ret;
 }
 }
 
 
-int SrsBandwidthPacket::get_perfer_cid()
+int SrsBandwidthPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverStream;
     return RTMP_CID_OverStream;
 }
 }
@@ -3418,7 +3418,7 @@ SrsOnStatusDataPacket::~SrsOnStatusDataPacket()
     srs_freep(data);
     srs_freep(data);
 }
 }
 
 
-int SrsOnStatusDataPacket::get_perfer_cid()
+int SrsOnStatusDataPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverStream;
     return RTMP_CID_OverStream;
 }
 }
@@ -3465,7 +3465,7 @@ SrsSampleAccessPacket::~SrsSampleAccessPacket()
 {
 {
 }
 }
 
 
-int SrsSampleAccessPacket::get_perfer_cid()
+int SrsSampleAccessPacket::get_prefer_cid()
 {
 {
     return RTMP_CID_OverStream;
     return RTMP_CID_OverStream;
 }
 }

@@ -586,7 +586,7 @@ public:
     virtual int decode(SrsStream* stream);
     virtual int decode(SrsStream* stream);
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -623,7 +623,7 @@ public:
     virtual int decode(SrsStream* stream);
     virtual int decode(SrsStream* stream);
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -664,7 +664,7 @@ public:
     virtual int decode(SrsStream* stream);
     virtual int decode(SrsStream* stream);
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -697,7 +697,7 @@ public:
     virtual ~SrsCallResPacket();
     virtual ~SrsCallResPacket();
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -734,7 +734,7 @@ public:
     virtual int decode(SrsStream* stream);
     virtual int decode(SrsStream* stream);
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -770,7 +770,7 @@ public:
     virtual int decode(SrsStream* stream);
     virtual int decode(SrsStream* stream);
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -833,7 +833,7 @@ public:
     virtual int decode(SrsStream* stream);
     virtual int decode(SrsStream* stream);
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -873,7 +873,7 @@ public:
     virtual int decode(SrsStream* stream);
     virtual int decode(SrsStream* stream);
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -927,7 +927,7 @@ public:
     virtual int decode(SrsStream* stream);
     virtual int decode(SrsStream* stream);
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -1044,7 +1044,7 @@ public:
     virtual int decode(SrsStream* stream);
     virtual int decode(SrsStream* stream);
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -1082,7 +1082,7 @@ public:
     virtual ~SrsPlayResPacket();
     virtual ~SrsPlayResPacket();
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -1112,7 +1112,7 @@ public:
     virtual ~SrsOnBWDonePacket();
     virtual ~SrsOnBWDonePacket();
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -1148,7 +1148,7 @@ public:
     virtual ~SrsOnStatusCallPacket();
     virtual ~SrsOnStatusCallPacket();
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -1191,7 +1191,7 @@ public:
     virtual int decode(SrsStream* stream);
     virtual int decode(SrsStream* stream);
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -1245,7 +1245,7 @@ public:
     virtual ~SrsOnStatusDataPacket();
     virtual ~SrsOnStatusDataPacket();
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();
@@ -1280,7 +1280,7 @@ public:
     virtual ~SrsSampleAccessPacket();
     virtual ~SrsSampleAccessPacket();
 // encode functions for concrete packet to override.
 // encode functions for concrete packet to override.
 public:
 public:
-    virtual int get_perfer_cid();
+    virtual int get_prefer_cid();
     virtual int get_message_type();
     virtual int get_message_type();
 protected:
 protected:
     virtual int get_size();
     virtual int get_size();

@@ -64,8 +64,15 @@ MockSrsConfig::~MockSrsConfig()
 
 
 int MockSrsConfig::parse(string buf)
 int MockSrsConfig::parse(string buf)
 {
 {
+    int ret = ERROR_SUCCESS;
+
     MockSrsConfigBuffer buffer(buf);
     MockSrsConfigBuffer buffer(buf);
-    return parse_buffer(&buffer);
+
+    if ((ret = parse_buffer(&buffer)) != ERROR_SUCCESS) {
+        return ret;
+    }
+
+    return check_config();
 }
 }
 
 
 #ifdef ENABLE_UTEST_CONFIG
 #ifdef ENABLE_UTEST_CONFIG