refine code, refine the handshake, refine the log of source_id

@@ -365,8 +365,9 @@ int SrsRtmpConn::stream_service_cycle()
     }
     
     bool enabled_cache = _srs_config->get_gop_cache(req->vhost);
-    srs_trace("source url=%s, ip=%s, cache=%d, is_edge=%d, id=%d", 
-        req->get_stream_url().c_str(), ip.c_str(), enabled_cache, vhost_is_edge, source->source_id());
+    srs_trace("source url=%s, ip=%s, cache=%d, is_edge=%d, source_id=%d[%d]", 
+        req->get_stream_url().c_str(), ip.c_str(), enabled_cache, vhost_is_edge, 
+        source->source_id(), source->source_id());
     source->set_cache(enabled_cache);
     
     switch (type) {

@@ -338,7 +338,7 @@ int SrsConsumer::dump_packets(int max_count, SrsSharedPtrMessage** pmsgs, int& c
     srs_assert(max_count > 0);
     
     if (should_update_source_id) {
-        srs_trace("update source_id=%d", source->source_id());
+        srs_trace("update source_id=%d[%d]", source->source_id(), source->source_id());
         should_update_source_id = false;
     }
     

@@ -866,17 +866,15 @@ namespace _srs_internal
         if (schema == srs_schema0) {
             srs_key_block_init(&block0.key);
             srs_digest_block_init(&block1.digest);
-        } else {
-            srs_digest_block_init(&block0.digest);
-            srs_key_block_init(&block1.key);
-        }
-        
-        if (schema == srs_schema0) {
+            
             if ((ret = openssl_generate_key(c1->block0.key.key, block0.key.key, 128)) != ERROR_SUCCESS) {
                 srs_error("calc s1 key failed. ret=%d", ret);
                 return ret;
             }
         } else {
+            srs_digest_block_init(&block0.digest);
+            srs_key_block_init(&block1.key);
+            
             if ((ret = openssl_generate_key(c1->block1.key.key, block1.key.key, 128)) != ERROR_SUCCESS) {
                 srs_error("calc s1 key failed. ret=%d", ret);
                 return ret;