Confronta il testo

Trova la differenza tra due file di testo

Editor live

Comprimi invariate

Senza a capo

Layout

Livello di dettaglio

Evidenziazione sintassi

Diffchecker Desktop Il modo più sicuro per usare Diffchecker. Ottieni l'app Diffchecker Desktop: i tuoi diff non lasciano mai il tuo computer!Ottieni Desktop

Untitled diff

Creato 11 anni faIl diff non scade mai

1 rimozione

Linee
Totale
Rimosso

Caratteri
Totale
Rimosso

Per continuare a utilizzare questa funzione, aggiorna a Diffchecker Pro Visualizza prezzi

77 linee

18 aggiunte

Linee
Totale
Aggiunto

Caratteri
Totale
Aggiunto

Per continuare a utilizzare questa funzione, aggiorna a Diffchecker Pro Visualizza prezzi

94 linee

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'

Diff salvati

Testo originale

Apri file

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'

Testo modificato

Apri file

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'