比较文本

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

实时编辑器

折叠未更改行

关闭换行

视图

比对精度

语法高亮

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

Untitled diff

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

1 删除

行
总计
删除

字符
总计
删除

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

77 行

18 添加

行
总计
添加

字符
总计
添加

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

94 行

config interface 'loopback'

option ifname 'lo'

option proto 'static'

option ipaddr '127.0.0.1'

option netmask '255.0.0.0'

config globals 'globals'

option ula_prefix 'fd4c:87a9:881b::/48'

config switch

option name 'switch0'

option reset '1'

option enable_vlan '1'

config switch_vlan

option device 'switch0'

option vlan '1'

option ports '2 3 4 5 6t'

option ports '2 3 4 6t'

#Agregado

config switch_vlan

option device 'switch0'

option vlan '4'

option vid '5'

option ports '0t 5'

config switch_vlan

option device 'switch0'

option vlan '2'

option ports '1t 6t'

config switch_vlan

option device 'switch0'

option vlan '3'

option ports '1t 6t'

config switch_vlan

option device 'switch0'

option vlan '6'

option ports '1t 6t'

config interface 'lan'

option ifname 'eth0.1'

option type 'bridge'

option proto 'static'

option ip6assign '60'

option igmp_snooping '1'

option ipaddr '192.168.1.1'

option netmask '255.255.255.0'

config interface 'iptv'

option ifname 'eth0.2'

option proto 'static'

option ipaddr '10.96.226.31'

option netmask '255.192.0.0'

option gateway '10.64.0.1'

option defaultroute '0'

option peerdns '0'

config route

option interface 'iptv'

option target '172.16.x.x' # Por seguridad he ocultado estos datos, pero funciona correctamente esta regla

option netmask '255.x.0.0'

option gateway '10.x.x.x'

config interface 'voip'

option ifname 'eth0.3'

option proto 'dhcp'

option defaultroute '0'

option peerdns '0'

config interface 'wan'

option ifname 'eth0.6'

option proto 'pppoe'

option username 'adslppp@telefonicanetpa'

option password 'adslppp'

option ipv6 '1'

option mtu '1492'

config interface 'wan6'

option ifname 'wan'

option proto 'dhcpv6'

# Agregado

config interface 'tvlan'

option ifname 'eth0.4'

option proto 'static'

option ipaddr '192.168.2.1'

option netmask '255.255.255.0'

已保存差异

原始文本

打开文件

config interface 'loopback'
	option ifname 'lo'
	option proto 'static'
	option ipaddr '127.0.0.1'
	option netmask '255.0.0.0'

config globals 'globals'
	option ula_prefix 'fd4c:87a9:881b::/48'

config switch
	option name 'switch0'
	option reset '1'
	option enable_vlan '1'

config switch_vlan
	option device 'switch0'
	option vlan '1'
	option ports '2 3 4 5 6t'

config switch_vlan
	option device 'switch0'
	option vlan '2'
	option ports '1t 6t'

config switch_vlan
	option device 'switch0'
	option vlan '3'
	option ports '1t 6t'

config switch_vlan
	option device 'switch0'
	option vlan '6'
	option ports '1t 6t'

config interface 'lan'
	option ifname 'eth0.1'
	option type 'bridge'
	option proto 'static'
	option ip6assign '60'
	option igmp_snooping '1'
	option ipaddr '192.168.1.1'
	option netmask '255.255.255.0'

config interface 'iptv'
	option ifname 'eth0.2'
	option proto 'static'
	option ipaddr '10.96.226.31'
	option netmask '255.192.0.0'
	option gateway '10.64.0.1'
	option defaultroute '0'
	option peerdns '0'

config route
	option interface 'iptv'
	option target '172.16.x.x' # Por seguridad he ocultado estos datos, pero funciona correctamente esta regla
	option netmask '255.x.0.0'
	option gateway '10.x.x.x'

config interface 'voip'
	option ifname 'eth0.3'
	option proto 'dhcp'
	option defaultroute '0'
	option peerdns '0'

config interface 'wan'
	option ifname 'eth0.6'
	option proto 'pppoe'
	option username 'adslppp@telefonicanetpa'
	option password 'adslppp'
	option ipv6 '1'
	option mtu '1492'

config interface 'wan6'
	option ifname 'wan'
	option proto 'dhcpv6'

更改后文本

打开文件

config interface 'loopback'
	option ifname 'lo'
	option proto 'static'
	option ipaddr '127.0.0.1'
	option netmask '255.0.0.0'

config globals 'globals'
	option ula_prefix 'fd4c:87a9:881b::/48'

config switch
	option name 'switch0'
	option reset '1'
	option enable_vlan '1'

config switch_vlan
	option device 'switch0'
	option vlan '1'
	option ports '2 3 4 6t'

#Agregado 
config switch_vlan
	option device 'switch0'
	option vlan '4'
	option vid '5'
	option ports '0t 5'

config switch_vlan
	option device 'switch0'
	option vlan '2'
	option ports '1t 6t'

config switch_vlan
	option device 'switch0'
	option vlan '3'
	option ports '1t 6t'

config switch_vlan
	option device 'switch0'
	option vlan '6'
	option ports '1t 6t'

config interface 'voip'
	option ifname 'eth0.3'
	option proto 'dhcp'
	option defaultroute '0'
	option peerdns '0'

config interface 'wan'
	option ifname 'eth0.6'
	option proto 'pppoe'
	option username 'adslppp@telefonicanetpa'
	option password 'adslppp'
	option ipv6 '1'
	option mtu '1492'

config interface 'wan6'
	option ifname 'wan'
	option proto 'dhcpv6'
    
    
# Agregado
config interface 'tvlan'                         
        option ifname 'eth0.4'                   
        option proto 'static'                    
        option ipaddr '192.168.2.1'              
        option netmask '255.255.255.0'