比较文本

查找两个文本文件之间的差异

实时编辑器

折叠未更改行

关闭换行

视图

比对精度

语法高亮

Diffchecker Desktop 运行Diffchecker最安全的方式。获取Diffchecker桌面应用：您的差异永远不会离开您的电脑！获取桌面版

Untitled diff

创建于 11年前差异永不过期

0 删除

行
总计
删除

字符
总计
删除

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

72 行

1 添加

行
总计
添加

字符
总计
添加

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

73 行

######################################

##-- mcproxy configuration script --##

######################################

# Protocol: IGMPv1|IGMPv2|IGMPv3 (IPv4) - MLDv1|MLDv2 (IPv6)

protocol IGMPv3;

###########################################

# Proxy Instance: upstream ==> downstream

pinstance A: ap a1 ==> ap a2;

pinstance B: bp b1 ==> bp b2;

# Proxy Instance: upstream ==> downstream

pinstance iptv: "eth0.2" ==> "eth0.4";

###########################################

# Tables

table allways {

(*|*)

};

table piA_peering_ifs {

ap(*|*)

};

table piA_upstreams {

a1(*|*)

};

table piB_peering_ifs {

bp(*|*)

};

table piB_upstreams {

b1(*|*)

};

###########################################

# Instance Behaviour

pinstance A upstream * in rulematching mutex 10; #or 25ms (u4)

#pinstance A upstream * out rulematching all; #default

pinstance A upstream ap out blacklist table allways; #(u1)

#pinstance A upstream ap in whitelist table {(*|*)}; #default (u2, u3)

pinstance A upstream a1 out blacklist table piA_peering_ifs; #(u3_1)

#pinstance A upstream a1 in whitelist table {(*|*)}; #default

pinstance A downstream ap in blacklist table allways; #(d1)

pinstance A downstream ap out blacklist table piA_upstreams; #(d2, d2_1, d3, d4)

#pinstance A downstream a2 in whitelist table {(*|*)}; #default

#pinstance A downstream a2 out whitelist table {(*|*)}; #default

pinstance B upstream * in rulematching mutex 10; #or 25ms (u4)

#pinstance B upstream * out rulematching all; #default

pinstance B upstream bp out blacklist table allways; #(u1)

#pinstance B upstream bp in whitelist table {(*|*)}; #default (u2, u3)

pinstance B upstream b1 out blacklist table piB_peering_ifs; #(u3_1)

#pinstance b upstream b1 in whitelist table {(*|*)}; #default

pinstance B downstream bp in blacklist table allways; #(d1)

pinstance B downstream bp out blacklist table piB_upstreams; #(d2, d2_1, d3, d4)

#pinstance B downstream b2 in whitelist table {(*|*)}; #default

#pinstance B downstream b2 out whitelist table {(*|*)}; #default

已保存差异

原始文本

打开文件

######################################                      
##-- mcproxy configuration script --##                      
######################################   
                                           
# Protocol: IGMPv1|IGMPv2|IGMPv3 (IPv4) - MLDv1|MLDv2 (IPv6)
protocol IGMPv3;                         
                                           
###########################################
                             
# Proxy Instance: upstream ==> downstream  
pinstance A: ap a1 ==> ap a2;            
pinstance B: bp b1 ==> bp b2;          
                                           
# Proxy Instance: upstream ==> downstream  
                       
###########################################
                     
# Tables             
table allways {        
        (*|*)                              
};                     
                                           
table piA_peering_ifs {                                       
        ap(*|*)                                       
};                                                            
                                                              
table piA_upstreams {                                                 
        a1(*|*)                                           
};                                                                    
                                                                      
table piB_peering_ifs {                                               
        bp(*|*)                                                     
};                                                                              
                                                                      
table piB_upstreams {                                                           
        b1(*|*)                                                                 
};                                                                              
                                                                    
###########################################                           
                                                                                
                                           
# Instance Behaviour                       
pinstance A upstream * in rulematching mutex 10; #or 25ms (u4)
#pinstance A upstream * out rulematching all; #default        
                                                              
pinstance A upstream ap out blacklist table allways; #(u1)    
#pinstance A upstream ap in whitelist table {(*|*)}; #default (u2, u3)
                                                                      
pinstance A upstream a1 out blacklist table piA_peering_ifs; #(u3_1)  
#pinstance A upstream a1 in whitelist table {(*|*)}; #default         
                                                                      
pinstance A downstream ap in blacklist table allways; #(d1)           
pinstance A downstream ap out blacklist table piA_upstreams; #(d2, d2_1, d3, d4)
                                                                                
#pinstance A downstream a2 in whitelist table {(*|*)}; #default                 
#pinstance A downstream a2 out whitelist table {(*|*)}; #default                
                                                                                
pinstance B upstream * in rulematching mutex 10;  #or 25ms (u4)                 
#pinstance B upstream * out rulematching all; #default                          
                                                                                
pinstance B upstream bp out blacklist table allways; #(u1)                      
#pinstance B upstream bp in whitelist table {(*|*)}; #default (u2, u3)          
                                                                                
pinstance B upstream b1 out blacklist table piB_peering_ifs; #(u3_1)            
#pinstance b upstream b1 in whitelist table {(*|*)}; #default                   
                                                                                
pinstance B downstream bp in blacklist table allways; #(d1)                     
pinstance B downstream bp out blacklist table piB_upstreams; #(d2, d2_1, d3, d4)
                                                                                
#pinstance B downstream b2 in whitelist table {(*|*)}; #default                 
#pinstance B downstream b2 out whitelist table {(*|*)}; #default                
-

更改后文本

打开文件

######################################                      
##-- mcproxy configuration script --##                      
######################################   
                                           
# Protocol: IGMPv1|IGMPv2|IGMPv3 (IPv4) - MLDv1|MLDv2 (IPv6)
protocol IGMPv3;                         
                                           
###########################################
                             
# Proxy Instance: upstream ==> downstream  
pinstance A: ap a1 ==> ap a2;            
pinstance B: bp b1 ==> bp b2;          
                                           
# Proxy Instance: upstream ==> downstream  
pinstance iptv: "eth0.2" ==> "eth0.4";
                       
###########################################
                     
# Tables             
table allways {        
        (*|*)                              
};                     
                                           
table piA_peering_ifs {                                       
        ap(*|*)                                       
};                                                            
                                                              
table piA_upstreams {                                                 
        a1(*|*)                                           
};                                                                    
                                                                      
table piB_peering_ifs {                                               
        bp(*|*)                                                     
};                                                                              
                                                                      
table piB_upstreams {                                                           
        b1(*|*)                                                                 
};                                                                              
                                                                    
###########################################                           
                                                                                
                                           
# Instance Behaviour                       
pinstance A upstream * in rulematching mutex 10; #or 25ms (u4)
#pinstance A upstream * out rulematching all; #default        
                                                              
pinstance A upstream ap out blacklist table allways; #(u1)    
#pinstance A upstream ap in whitelist table {(*|*)}; #default (u2, u3)
                                                                      
pinstance A upstream a1 out blacklist table piA_peering_ifs; #(u3_1)  
#pinstance A upstream a1 in whitelist table {(*|*)}; #default         
                                                                      
pinstance A downstream ap in blacklist table allways; #(d1)           
pinstance A downstream ap out blacklist table piA_upstreams; #(d2, d2_1, d3, d4)
                                                                                
#pinstance A downstream a2 in whitelist table {(*|*)}; #default                 
#pinstance A downstream a2 out whitelist table {(*|*)}; #default                
                                                                                
pinstance B upstream * in rulematching mutex 10;  #or 25ms (u4)                 
#pinstance B upstream * out rulematching all; #default                          
                                                                                
pinstance B upstream bp out blacklist table allways; #(u1)                      
#pinstance B upstream bp in whitelist table {(*|*)}; #default (u2, u3)          
                                                                                
pinstance B upstream b1 out blacklist table piB_peering_ifs; #(u3_1)            
#pinstance b upstream b1 in whitelist table {(*|*)}; #default                   
                                                                                
pinstance B downstream bp in blacklist table allways; #(d1)                     
pinstance B downstream bp out blacklist table piB_upstreams; #(d2, d2_1, d3, d4)
                                                                                
#pinstance B downstream b2 in whitelist table {(*|*)}; #default                 
#pinstance B downstream b2 out whitelist table {(*|*)}; #default                
-