比较文本

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

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

工具

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled diff

Created 10 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

75 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

2014 Note: option http-proxy-fallback ignored because no TCP-based connection profiles are defined

2014 OpenVPNAS 2.1.1oOAS Win32-MSVC++ [SSL] [LZO2] built on Jul 29 2010

2014 MANAGEMENT: Connected to management server at 127.0.0.1:62413

2014 MANAGEMENT: Connected to management server at 127.0.0.1:33094

2014 MANAGEMENT: CMD 'log on'

2014 MANAGEMENT: CMD 'state on'

2014 MANAGEMENT: CMD 'echo on'

2014 MANAGEMENT: CMD 'bytecount 5'

2014 MANAGEMENT: CMD 'hold off'

2014 MANAGEMENT: CMD 'hold release'

2014 WARNING: No server certificate verification method has been enabled. See http://openvpn.net/howto.html#mitm for more info.

2014 NOTE: OpenVPNAS 2.1 requires '--script-security 2' or higher to call user-defined scripts or executables

2014 LZO compression initialized

2014 Control Channel MTU parms [ L:1542 D:138 EF:38 EB:0 ET:0 EL:0 ]

2014 Socket Buffers: R=[65536->65536] S=[65536->65536]

2014 Data Channel MTU parms [ L:1542 D:1450 EF:42 EB:135 ET:0 EL:0 AF:3/1 ]

2014 Local Options hash (VER=V4): '41690919'

2014 Expected Remote Options hash (VER=V4): '530fdded'

2014 UDPv4 link local: [undef]

2014 UDPv4 link remote: myserveripadress:1194

2014 MANAGEMENT: >STATE:1398192024,WAIT,,,

2014 MANAGEMENT: >STATE:1398192272,WAIT,,,

2014 MANAGEMENT: >STATE:1398192024,AUTH,,,

2014 MANAGEMENT: >STATE:1398192272,AUTH,,,

2014 TLS: Initial packet from myserveripadress:1194, sid=fada5090 b722b479

2014 TLS: Initial packet from myserveripadress:1194, sid=1664b70b c95aa3d4

2014 VERIFY OK: depth=1, /C=FR/ST=IDF/L=Paris/O=Maison/OU=changeme/CN=Papy/name=Papy/emailAddress=mymail

2014 VERIFY OK: depth=0, /C=FR/ST=IDF/L=Paris/O=Maison/OU=changeme/CN=papy/name=changeme/emailAddress=mail@host.domain

2014 Data Channel Encrypt: Cipher 'BF-CBC' initialized with 128 bit key

2014 Data Channel Encrypt: Using 160 bit message hash 'SHA1' for HMAC authentication

2014 Data Channel Decrypt: Cipher 'BF-CBC' initialized with 128 bit key

2014 Data Channel Decrypt: Using 160 bit message hash 'SHA1' for HMAC authentication

2014 Control Channel: TLSv1, cipher TLSv1/SSLv3 DHE-RSA-AES256-SHA, 2048 bit RSA

2014 [papy] Peer Connection Initiated with myserveripadress:1194

2014 MANAGEMENT: >STATE:1398192030,GET_CONFIG,,,

2014 MANAGEMENT: >STATE:1398192274,GET_CONFIG,,,

2014 SENT CONTROL [papy]: 'PUSH_REQUEST' (status=1)

2014 PUSH: Received control message: 'PUSH_REPLY,redirect-gateway def1 bypass-dhcp,route 10.8.0.1,topology net30,ping 10,ping-restart 120,ifconfig 10.8.0.6 10.8.0.5'

2014 OPTIONS IMPORT: timers and/or timeouts modified

2014 OPTIONS IMPORT: --ifconfig/up options modified

2014 OPTIONS IMPORT: route options modified

2014 ROUTE default_gateway=192.168.43.1

2014 ROUTE default_gateway=192.168.0.1

2014 MANAGEMENT: >STATE:1398192031,ASSIGN_IP,,10.8.0.6,

2014 MANAGEMENT: >STATE:1398192275,ASSIGN_IP,,10.8.0.6,

2014 TAP-WIN32 device [Connexion au réseau local] opened: \\.\Global\{149DD29E-270E-4F1F-9E7C-4FD721EFD772}.tap

2014 TAP-Win32 Driver Version 9.7

2014 TAP-Win32 MTU=1500

2014 Notified TAP-Win32 driver to set a DHCP IP/netmask of 10.8.0.6/255.255.255.252 on interface {149DD29E-270E-4F1F-9E7C-4FD721EFD772} [DHCP-serv: 10.8.0.5, lease-time: 31536000]

2014 Successful ARP Flush on interface [7] {149DD29E-270E-4F1F-9E7C-4FD721EFD772}

2014 TEST ROUTES: 2/2 succeeded len=1 ret=1 a=0 u/d=up

2014 C:\WINDOWS\system32\route.exe ADD myserveripadress MASK 255.255.255.255 192.168.43.1

2014 C:\WINDOWS\system32\route.exe ADD myserveripadress MASK 255.255.255.255 192.168.0.1

2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=25 and dwForwardType=4

2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=10 and dwForwardType=4

2014 Route addition via IPAPI succeeded [adaptive]

2014 C:\WINDOWS\system32\route.exe ADD 0.0.0.0 MASK 128.0.0.0 10.8.0.5

2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=30 and dwForwardType=4

2014 Route addition via IPAPI succeeded [adaptive]

2014 C:\WINDOWS\system32\route.exe ADD 128.0.0.0 MASK 128.0.0.0 10.8.0.5

2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=30 and dwForwardType=4

2014 Route addition via IPAPI succeeded [adaptive]

2014 MANAGEMENT: >STATE:1398192036,ADD_ROUTES,,,

2014 MANAGEMENT: >STATE:1398192280,ADD_ROUTES,,,

2014 C:\WINDOWS\system32\route.exe ADD 10.8.0.1 MASK 255.255.255.255 10.8.0.5

2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=30 and dwForwardType=4

2014 Route addition via IPAPI succeeded [adaptive]

2014 Initialization Sequence Completed

2014 MANAGEMENT: >STATE:1398192036,CONNECTED,SUCCESS,10.8.0.6,myserveripadress

2014 MANAGEMENT: >STATE:1398192280,CONNECTED,SUCCESS,10.8.0.6,myserveripadress

2014 MANAGEMENT: CMD 'exit'

2014 MANAGEMENT: Client disconnected

2014 MANAGEMENT: Triggering management exit

2014 TCP/UDP: Closing socket

2014 C:\WINDOWS\system32\route.exe DELETE 10.8.0.1 MASK 255.255.255.255 10.8.0.5

2014 Route deletion via IPAPI succeeded [adaptive]

2014 C:\WINDOWS\system32\route.exe DELETE myserveripadress MASK 255.255.255.255 192.168.43.1

2014 C:\WINDOWS\system32\route.exe DELETE myserveripadress MASK 255.255.255.255 192.168.0.1

2014 Route deletion via IPAPI succeeded [adaptive]

2014 C:\WINDOWS\system32\route.exe DELETE 0.0.0.0 MASK 128.0.0.0 10.8.0.5

2014 Route deletion via IPAPI succeeded [adaptive]

2014 C:\WINDOWS\system32\route.exe DELETE 128.0.0.0 MASK 128.0.0.0 10.8.0.5

2014 Route deletion via IPAPI succeeded [adaptive]

2014 Closing TUN/TAP interface

2014 SIGTERM[soft,management-exit] received, process exiting

2014 MANAGEMENT: >STATE:1398192160,EXITING,management-exit,,

2014 MANAGEMENT: >STATE:1398192284,EXITING,management-exit,,

已保存差异

原始文本

打开文件

2014 Note: option http-proxy-fallback ignored because no TCP-based connection profiles are defined
2014 OpenVPNAS 2.1.1oOAS Win32-MSVC++ [SSL] [LZO2] built on Jul 29 2010
2014 MANAGEMENT: Connected to management server at 127.0.0.1:62413
2014 MANAGEMENT: CMD 'log on'
2014 MANAGEMENT: CMD 'state on'
2014 MANAGEMENT: CMD 'echo on'
2014 MANAGEMENT: CMD 'bytecount 5'
2014 MANAGEMENT: CMD 'hold off'
2014 MANAGEMENT: CMD 'hold release'
2014 WARNING: No server certificate verification method has been enabled.  See http://openvpn.net/howto.html#mitm for more info.
2014 NOTE: OpenVPNAS 2.1 requires '--script-security 2' or higher to call user-defined scripts or executables
2014 LZO compression initialized
2014 Control Channel MTU parms [ L:1542 D:138 EF:38 EB:0 ET:0 EL:0 ]
2014 Socket Buffers: R=[65536->65536] S=[65536->65536]
2014 Data Channel MTU parms [ L:1542 D:1450 EF:42 EB:135 ET:0 EL:0 AF:3/1 ]
2014 Local Options hash (VER=V4): '41690919'
2014 Expected Remote Options hash (VER=V4): '530fdded'
2014 UDPv4 link local: [undef]
2014 UDPv4 link remote: myserveripadress:1194
2014 MANAGEMENT: >STATE:1398192024,WAIT,,,
2014 MANAGEMENT: >STATE:1398192024,AUTH,,,
2014 TLS: Initial packet from myserveripadress:1194, sid=fada5090 b722b479
2014 VERIFY OK: depth=1, /C=FR/ST=IDF/L=Paris/O=Maison/OU=changeme/CN=Papy/name=Papy/emailAddress=mymail
2014 VERIFY OK: depth=0, /C=FR/ST=IDF/L=Paris/O=Maison/OU=changeme/CN=papy/name=changeme/emailAddress=mail@host.domain
2014 Data Channel Encrypt: Cipher 'BF-CBC' initialized with 128 bit key
2014 Data Channel Encrypt: Using 160 bit message hash 'SHA1' for HMAC authentication
2014 Data Channel Decrypt: Cipher 'BF-CBC' initialized with 128 bit key
2014 Data Channel Decrypt: Using 160 bit message hash 'SHA1' for HMAC authentication
2014 Control Channel: TLSv1, cipher TLSv1/SSLv3 DHE-RSA-AES256-SHA, 2048 bit RSA
2014 [papy] Peer Connection Initiated with myserveripadress:1194
2014 MANAGEMENT: >STATE:1398192030,GET_CONFIG,,,
2014 SENT CONTROL [papy]: 'PUSH_REQUEST' (status=1)
2014 PUSH: Received control message: 'PUSH_REPLY,redirect-gateway def1 bypass-dhcp,route 10.8.0.1,topology net30,ping 10,ping-restart 120,ifconfig 10.8.0.6 10.8.0.5'
2014 OPTIONS IMPORT: timers and/or timeouts modified
2014 OPTIONS IMPORT: --ifconfig/up options modified
2014 OPTIONS IMPORT: route options modified
2014 ROUTE default_gateway=192.168.43.1
2014 MANAGEMENT: >STATE:1398192031,ASSIGN_IP,,10.8.0.6,
2014 TAP-WIN32 device [Connexion au réseau local] opened: \\.\Global\{149DD29E-270E-4F1F-9E7C-4FD721EFD772}.tap
2014 TAP-Win32 Driver Version 9.7 
2014 TAP-Win32 MTU=1500
2014 Notified TAP-Win32 driver to set a DHCP IP/netmask of 10.8.0.6/255.255.255.252 on interface {149DD29E-270E-4F1F-9E7C-4FD721EFD772} [DHCP-serv: 10.8.0.5, lease-time: 31536000]
2014 Successful ARP Flush on interface [7] {149DD29E-270E-4F1F-9E7C-4FD721EFD772}
2014 TEST ROUTES: 2/2 succeeded len=1 ret=1 a=0 u/d=up
2014 C:\WINDOWS\system32\route.exe ADD myserveripadress MASK 255.255.255.255 192.168.43.1
2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=25 and dwForwardType=4
2014 Route addition via IPAPI succeeded [adaptive]
2014 C:\WINDOWS\system32\route.exe ADD 0.0.0.0 MASK 128.0.0.0 10.8.0.5
2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=30 and dwForwardType=4
2014 Route addition via IPAPI succeeded [adaptive]
2014 C:\WINDOWS\system32\route.exe ADD 128.0.0.0 MASK 128.0.0.0 10.8.0.5
2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=30 and dwForwardType=4
2014 Route addition via IPAPI succeeded [adaptive]
2014 MANAGEMENT: >STATE:1398192036,ADD_ROUTES,,,
2014 C:\WINDOWS\system32\route.exe ADD 10.8.0.1 MASK 255.255.255.255 10.8.0.5
2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=30 and dwForwardType=4
2014 Route addition via IPAPI succeeded [adaptive]
2014 Initialization Sequence Completed
2014 MANAGEMENT: >STATE:1398192036,CONNECTED,SUCCESS,10.8.0.6,myserveripadress
2014 MANAGEMENT: CMD 'exit'
2014 MANAGEMENT: Client disconnected
2014 MANAGEMENT: Triggering management exit
2014 TCP/UDP: Closing socket
2014 C:\WINDOWS\system32\route.exe DELETE 10.8.0.1 MASK 255.255.255.255 10.8.0.5
2014 Route deletion via IPAPI succeeded [adaptive]
2014 C:\WINDOWS\system32\route.exe DELETE myserveripadress MASK 255.255.255.255 192.168.43.1
2014 Route deletion via IPAPI succeeded [adaptive]
2014 C:\WINDOWS\system32\route.exe DELETE 0.0.0.0 MASK 128.0.0.0 10.8.0.5
2014 Route deletion via IPAPI succeeded [adaptive]
2014 C:\WINDOWS\system32\route.exe DELETE 128.0.0.0 MASK 128.0.0.0 10.8.0.5
2014 Route deletion via IPAPI succeeded [adaptive]
2014 Closing TUN/TAP interface
2014 SIGTERM[soft,management-exit] received, process exiting
2014 MANAGEMENT: >STATE:1398192160,EXITING,management-exit,,

更改后文本

打开文件

2014 Note: option http-proxy-fallback ignored because no TCP-based connection profiles are defined
2014 OpenVPNAS 2.1.1oOAS Win32-MSVC++ [SSL] [LZO2] built on Jul 29 2010
2014 MANAGEMENT: Connected to management server at 127.0.0.1:33094
2014 MANAGEMENT: CMD 'log on'
2014 MANAGEMENT: CMD 'state on'
2014 MANAGEMENT: CMD 'echo on'
2014 MANAGEMENT: CMD 'bytecount 5'
2014 MANAGEMENT: CMD 'hold off'
2014 MANAGEMENT: CMD 'hold release'
2014 WARNING: No server certificate verification method has been enabled.  See http://openvpn.net/howto.html#mitm for more info.
2014 NOTE: OpenVPNAS 2.1 requires '--script-security 2' or higher to call user-defined scripts or executables
2014 LZO compression initialized
2014 Control Channel MTU parms [ L:1542 D:138 EF:38 EB:0 ET:0 EL:0 ]
2014 Socket Buffers: R=[65536->65536] S=[65536->65536]
2014 Data Channel MTU parms [ L:1542 D:1450 EF:42 EB:135 ET:0 EL:0 AF:3/1 ]
2014 Local Options hash (VER=V4): '41690919'
2014 Expected Remote Options hash (VER=V4): '530fdded'
2014 UDPv4 link local: [undef]
2014 UDPv4 link remote: myserveripadress:1194
2014 MANAGEMENT: >STATE:1398192272,WAIT,,,
2014 MANAGEMENT: >STATE:1398192272,AUTH,,,
2014 TLS: Initial packet from myserveripadress:1194, sid=1664b70b c95aa3d4
2014 VERIFY OK: depth=1, /C=FR/ST=IDF/L=Paris/O=Maison/OU=changeme/CN=Papy/name=Papy/emailAddress=mymail
2014 VERIFY OK: depth=0, /C=FR/ST=IDF/L=Paris/O=Maison/OU=changeme/CN=papy/name=changeme/emailAddress=mail@host.domain
2014 Data Channel Encrypt: Cipher 'BF-CBC' initialized with 128 bit key
2014 Data Channel Encrypt: Using 160 bit message hash 'SHA1' for HMAC authentication
2014 Data Channel Decrypt: Cipher 'BF-CBC' initialized with 128 bit key
2014 Data Channel Decrypt: Using 160 bit message hash 'SHA1' for HMAC authentication
2014 Control Channel: TLSv1, cipher TLSv1/SSLv3 DHE-RSA-AES256-SHA, 2048 bit RSA
2014 [papy] Peer Connection Initiated with myserveripadress:1194
2014 MANAGEMENT: >STATE:1398192274,GET_CONFIG,,,
2014 SENT CONTROL [papy]: 'PUSH_REQUEST' (status=1)
2014 PUSH: Received control message: 'PUSH_REPLY,redirect-gateway def1 bypass-dhcp,route 10.8.0.1,topology net30,ping 10,ping-restart 120,ifconfig 10.8.0.6 10.8.0.5'
2014 OPTIONS IMPORT: timers and/or timeouts modified
2014 OPTIONS IMPORT: --ifconfig/up options modified
2014 OPTIONS IMPORT: route options modified
2014 ROUTE default_gateway=192.168.0.1
2014 MANAGEMENT: >STATE:1398192275,ASSIGN_IP,,10.8.0.6,
2014 TAP-WIN32 device [Connexion au réseau local] opened: \\.\Global\{149DD29E-270E-4F1F-9E7C-4FD721EFD772}.tap
2014 TAP-Win32 Driver Version 9.7 
2014 TAP-Win32 MTU=1500
2014 Notified TAP-Win32 driver to set a DHCP IP/netmask of 10.8.0.6/255.255.255.252 on interface {149DD29E-270E-4F1F-9E7C-4FD721EFD772} [DHCP-serv: 10.8.0.5, lease-time: 31536000]
2014 Successful ARP Flush on interface [7] {149DD29E-270E-4F1F-9E7C-4FD721EFD772}
2014 TEST ROUTES: 2/2 succeeded len=1 ret=1 a=0 u/d=up
2014 C:\WINDOWS\system32\route.exe ADD myserveripadress MASK 255.255.255.255 192.168.0.1
2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=10 and dwForwardType=4
2014 Route addition via IPAPI succeeded [adaptive]
2014 C:\WINDOWS\system32\route.exe ADD 0.0.0.0 MASK 128.0.0.0 10.8.0.5
2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=30 and dwForwardType=4
2014 Route addition via IPAPI succeeded [adaptive]
2014 C:\WINDOWS\system32\route.exe ADD 128.0.0.0 MASK 128.0.0.0 10.8.0.5
2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=30 and dwForwardType=4
2014 Route addition via IPAPI succeeded [adaptive]
2014 MANAGEMENT: >STATE:1398192280,ADD_ROUTES,,,
2014 C:\WINDOWS\system32\route.exe ADD 10.8.0.1 MASK 255.255.255.255 10.8.0.5
2014 ROUTE: CreateIpForwardEntry succeeded with dwForwardMetric1=30 and dwForwardType=4
2014 Route addition via IPAPI succeeded [adaptive]
2014 Initialization Sequence Completed
2014 MANAGEMENT: >STATE:1398192280,CONNECTED,SUCCESS,10.8.0.6,myserveripadress
2014 MANAGEMENT: CMD 'exit'
2014 MANAGEMENT: Client disconnected
2014 MANAGEMENT: Triggering management exit
2014 TCP/UDP: Closing socket
2014 C:\WINDOWS\system32\route.exe DELETE 10.8.0.1 MASK 255.255.255.255 10.8.0.5
2014 Route deletion via IPAPI succeeded [adaptive]
2014 C:\WINDOWS\system32\route.exe DELETE myserveripadress MASK 255.255.255.255 192.168.0.1
2014 Route deletion via IPAPI succeeded [adaptive]
2014 C:\WINDOWS\system32\route.exe DELETE 0.0.0.0 MASK 128.0.0.0 10.8.0.5
2014 Route deletion via IPAPI succeeded [adaptive]
2014 C:\WINDOWS\system32\route.exe DELETE 128.0.0.0 MASK 128.0.0.0 10.8.0.5
2014 Route deletion via IPAPI succeeded [adaptive]
2014 Closing TUN/TAP interface
2014 SIGTERM[soft,management-exit] received, process exiting
2014 MANAGEMENT: >STATE:1398192284,EXITING,management-exit,,