Compare text

Find the difference between two text files

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Tools

Untitled diff

Created 9 years agoDiff never expires

0 removals

47 lines

12 additions

59 lines

config dnsmasq

option domainneeded '1'

option boguspriv '1'

option filterwin2k '0'

option localise_queries '1'

option rebind_localhost '1'

option local '/lan/'

option domain 'lan'

option expandhosts '1'

option nonegcache '0'

option authoritative '1'

option readethers '1'

option leasefile '/tmp/dhcp.leases'

option resolvfile '/tmp/resolv.conf.auto'

option localservice '1'

option rebind_protection '0'

config dhcp 'lan'

option interface 'lan'

option start '100'

option leasetime '12h'

option dhcpv6 'server'

option ra 'server'

option networkid 'tag:!dhcptv'

option limit '100'

option ra_management '1'

config dhcp 'wan'

option interface 'wan'

option ignore '1'

config odhcpd 'odhcpd'

option maindhcp '0'

option leasefile '/tmp/hosts/odhcpd'

option leasetrigger '/usr/sbin/odhcpd-update'

config vendorclass 'vendortv'

option vendorclass 'IAL'

option networkid 'dhcptv'

config dhcp 'dhcptv'

option networkid 'tag:dhcptv'

option interface 'lan'

option start '200'

option limit '23'

option leasetime '24h'

#Configuracion puesta yo

config dhcp 'tvlan'

option leasetime '12h'

option interface 'tvlan'

option start '100'

option limit '100'

list dhcp_option '6,172.26.23.3'

list dhcp_option '240,:::::239.0.2.10:22222:v6.0:239.0.2.30:22222'

#-------------------------

Saved diffs

Original text

Open file


config dnsmasq
	option domainneeded '1'
	option boguspriv '1'
	option filterwin2k '0'
	option localise_queries '1'
	option rebind_localhost '1'
	option local '/lan/'
	option domain 'lan'
	option expandhosts '1'
	option nonegcache '0'
	option authoritative '1'
	option readethers '1'
	option leasefile '/tmp/dhcp.leases'
	option resolvfile '/tmp/resolv.conf.auto'
	option localservice '1'
	option rebind_protection '0'

config dhcp 'lan'
	option interface 'lan'
	option start '100'
	option leasetime '12h'
	option dhcpv6 'server'
	option ra 'server'
	option networkid 'tag:!dhcptv'
	option limit '100'
	option ra_management '1'

config dhcp 'wan'
	option interface 'wan'
	option ignore '1'

config odhcpd 'odhcpd'
	option maindhcp '0'
	option leasefile '/tmp/hosts/odhcpd'
	option leasetrigger '/usr/sbin/odhcpd-update'

config vendorclass 'vendortv'
	option vendorclass 'IAL'
	option networkid 'dhcptv'

config dhcp 'dhcptv'
	option networkid 'tag:dhcptv'
	option interface 'lan'
	option start '200'
	option limit '23'
	option leasetime '24h'

Changed text

Open file


config dnsmasq
	option domainneeded '1'
	option boguspriv '1'
	option filterwin2k '0'
	option localise_queries '1'
	option rebind_localhost '1'
	option local '/lan/'
	option domain 'lan'
	option expandhosts '1'
	option nonegcache '0'
	option authoritative '1'
	option readethers '1'
	option leasefile '/tmp/dhcp.leases'
	option resolvfile '/tmp/resolv.conf.auto'
	option localservice '1'
	option rebind_protection '0'

config dhcp 'lan'
	option interface 'lan'
	option start '100'
	option leasetime '12h'
	option dhcpv6 'server'
	option ra 'server'
	option networkid 'tag:!dhcptv'
	option limit '100'
	option ra_management '1'

config dhcp 'wan'
	option interface 'wan'
	option ignore '1'

config odhcpd 'odhcpd'
	option maindhcp '0'
	option leasefile '/tmp/hosts/odhcpd'
	option leasetrigger '/usr/sbin/odhcpd-update'

config vendorclass 'vendortv'
	option vendorclass 'IAL'
	option networkid 'dhcptv'

config dhcp 'dhcptv'
	option networkid 'tag:dhcptv'
	option interface 'lan'
	option start '200'
	option limit '23'
	option leasetime '24h'
    
    
    
#Configuracion puesta yo
config dhcp 'tvlan'
	option leasetime '12h'
	option interface 'tvlan'
	option start '100'
	option limit '100'
	list dhcp_option '6,172.26.23.3'
	list dhcp_option '240,:::::239.0.2.10:22222:v6.0:239.0.2.30:22222'
#-------------------------