From 73440e48783ab5ee81fe9a34a56c2f57ee7a4191 Mon Sep 17 00:00:00 2001 From: fyodor Date: Sat, 11 Aug 2007 05:16:11 +0000 Subject: [PATCH] merge soc07 r5094:5098 - Updated to winpcap 4.01; Update reason documentation.; bugfix re multiple copies of winpcap installed --- CHANGELOG | 3 +++ docs/nmap.1 | 4 ++++ docs/refguide.xml | 12 ++++++++++++ mswin32/nsis/Nmap.nsi | 8 ++++---- mswin32/winpcap/Packet.dll | Bin 88952 -> 88696 bytes mswin32/winpcap/WanPacket.dll | Bin 68480 -> 68224 bytes mswin32/winpcap/winpcap-nmap.nsi | 21 +++++++++------------ mswin32/winpcap/wpcap.dll | Bin 240496 -> 240240 bytes 8 files changed, 32 insertions(+), 16 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d9e052298..1362d40f9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,9 @@ 4.22SOC1 +o Upgraded from WinPcap 4.0 to WinPcap 4.01 and fixed a versioning + error [Eddie] + o The port selection mechanism was overhauled. Nmap now knows (roughly) how common various services are, so you can specify options such as --top-ports 50 to scan the 50 most popular ports. diff --git a/docs/nmap.1 b/docs/nmap.1 index cd0f44a6b..04ec7f10c 100644 --- a/docs/nmap.1 +++ b/docs/nmap.1 @@ -118,6 +118,7 @@ SCAN TECHNIQUES: \-sO: IP protocol scan \-b : FTP bounce scan \-\-traceroute: Trace hop path to each host + \-\-reason: Display the reason a port is in a particular state PORT SPECIFICATION AND SCAN ORDER: \-p : Only scan specified ports Ex: \-p22; \-p1\-65535; \-p U:53,111,137,T:21\-25,80,139,8080 @@ -381,6 +382,9 @@ Traceroutes are performed post\-scan using information from the scan results to .sp Traceroute works by sending packets with a low TTL (time\-to\-live) in an attempt to illicit ICMP TTL_EXCCEDED messages from intermediate hops between the scanner and the target host. Standard traceroute implementation start with a TTL of 1 and increment the TTL until the destination host is reached. Nmap's traceroute starts with a high TTL and then decrements the TTL until it reaches 0. Doing it backwards lets nmap employ clever caching algorithms to speed up traces over multiple hosts. On average nmap sends 5\-10 fewer packets per host, depending on network conditions. If a single subnet is being scanned (i.e. 192.168.0.0/24) nmap may only have to send a single packet to most hosts. .TP +\fB\-\-reason\fR (Host and port state reasons) +Shows the reason each port is set to a specific state and the reason each host is up or down. This option displays the type of the packet that determined a port or hosts state. For example, A RST packet from a closed port or an echo reply from an alive host. The information nmap can provide is determined by the type of scan or ping. The SYN scan and SYN ping (\fB\-sS and -PT\fR) are very detailed. Whilst the TCP connect scan and ping (\fB\-sT\fR) are limited by the implementation of connect(). This feature is automatically enabled by the debug flag (\fB\-d\fR) and the results are stored in XML log files even if this option is not specified. +.TP \fB\-n\fR (No DNS resolution) Tells Nmap to \fInever\fR diff --git a/docs/refguide.xml b/docs/refguide.xml index cc1e48f50..77639d1bb 100644 --- a/docs/refguide.xml +++ b/docs/refguide.xml @@ -692,7 +692,19 @@ Traceroute works by sending packets with a low TTL (time-to-live) in an attempt + + + (Host and port state reasons) + + + --reason + Host and port state reasons + +Shows the reason each port is set to a specific state and the reason each host is up or down. This option displays the type of the packet that determined a port or hosts state. For example, A RST packet from a closed port or an echo reply from an alive host. The information nmap can provide is determined by the type of scan or ping. The SYN scan and SYN ping (\fB\-sS and -PT\fR) are very detailed. Whilst the TCP connect scan and ping (\fB\-sT\fR) are limited by the implementation of connect(). This feature is automatically enabled by the debug flag (\fB\-d\fR) and the results are stored in XML log files even if this option is not specified. + + + diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi index 6e13e9a32..6b0cfbe77 100644 --- a/mswin32/nsis/Nmap.nsi +++ b/mswin32/nsis/Nmap.nsi @@ -96,10 +96,10 @@ Section "Register Nmap Path" SecRegisterPath Call AddToPath SectionEnd -Section "WinPcap 4.0" SecWinPcap - File ..\winpcap\winpcap-nmap-4.0.exe - Exec '"$INSTDIR\winpcap-nmap-4.0.exe"' - Delete "$INSTDIR\winpcap-nmap-4.0.exe" +Section "WinPcap 4.01" SecWinPcap + File ..\winpcap\winpcap-nmap-4.01.exe + Exec '"$INSTDIR\winpcap-nmap-4.01.exe"' + Delete "$INSTDIR\winpcap-nmap-4.01.exe" SectionEnd Section "Network Performance Improvements (Registry Changes)" SecPerfRegistryMods diff --git a/mswin32/winpcap/Packet.dll b/mswin32/winpcap/Packet.dll index af93f21c335b2b332f4d0497d4038c53e0b13525..862c34115ee0f5cdb553ee630660bfe88d01fba4 100644 GIT binary patch delta 1636 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 diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi index 231c5fdfd..3ae8e5dbe 100644 --- a/mswin32/winpcap/winpcap-nmap.nsi +++ b/mswin32/winpcap/winpcap-nmap.nsi @@ -1,14 +1,17 @@ ;; Custom winpcap for nmap ;; Started by Doug Hoyte, April 2006 + +;; Eddie Bell ;; Updated to 4.0, June 2007 +;; Updated to 4.01, July 2007 ;-------------------------------- ; The name of the installer -Name "winpcap-nmap-4.0" +Name "winpcap-nmap-4.01" ; The file to write -OutFile "winpcap-nmap-4.0.exe" +OutFile "winpcap-nmap-4.01.exe" ; The default installation directory InstallDir $PROGRAMFILES\WinPcap @@ -40,7 +43,8 @@ UninstPage instfiles Function .onInit var /GLOBAL inst_ver var /GLOBAL my_ver - + StrCpy $my_ver "4.0.0.901" + IfSilent do_silent no_silent do_silent: @@ -62,13 +66,6 @@ Function .onInit IntOp $R5 $R1 & 0x0000FFFF StrCpy $inst_ver "$R2.$R3.$R4.$R5" - GetDllVersion "wpcap.dll" $R0 $R1 - IntOp $R2 $R0 / 0x00010000 - IntOp $R3 $R0 & 0x0000FFFF - IntOp $R4 $R1 / 0x00010000 - IntOp $R5 $R1 & 0x0000FFFF - StrCpy $my_ver "$R2.$R3.$R4.$R5" - StrCmp $inst_ver $my_ver same_ver MessageBox MB_YESNO|MB_ICONQUESTION "WinPcap version $inst_ver exists on this system. Replace with version $my_ver?" IDYES finish @@ -118,7 +115,7 @@ Section "" ;No components page, name is not important WriteRegStr HKLM "Software\WinPcap" "" '"$INSTDIR"' ; Write the uninstall keys for Windows - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "DisplayName" "winpcap-nmap 4.0" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "DisplayName" "winpcap-nmap 4.01" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "UninstallString" '"$INSTDIR\uninstall.exe"' WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "NoModify" 1 WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\winpcap-nmap" "NoRepair" 1 @@ -146,4 +143,4 @@ Section "Uninstall" RMDir "$INSTDIR" -SectionEnd \ No newline at end of file +SectionEnd diff --git a/mswin32/winpcap/wpcap.dll b/mswin32/winpcap/wpcap.dll index bc51be3076341be81f5486071a001137d7f40d57..60718cd4a8e29eae1afd37a16b42b96f00ced876 100644 GIT binary patch delta 2388 zcmZXVe>_wBAIHy+&Cju^pSmg}Q9`XGlphuMY`NVYkIo-^ob&md*X#X$zRvrcjXYKzX;;k{!3fqJ zT$4G@gcTu7)@slZ)UHhiE%@N^tjmXez)Q8t>3c+=F%r)N?LYZci0(WZt?Cflmp+n3f^b`UBjs`o?&P}QZ zqj9LzEnF8OB;DdTu3(Xj@dt;L0D$j9(zm*`F)gh^nB@*SDKWz}Ap)DPj2BJeMVJj# z9f$ynV<; z$zX-B+z)JpIbSFcAsuI(;zJ^^6R(ySK?EQQmrA>G0VbrbtVVy)UI=(m=>u!jwrTM! ziVF|nMP|F~lF$H#qgLWY7YPg$b7mh>*e{$&{$|oNCVFM{#sB-du!> zmRfUP$edf(;zd+94^NbqYbV=i)WRoup#h@Y(ItpM5U2r`2i+&)>IPP|AbP)5)pCE!U3R?Yzs(`5iCHXl`@uKYRG zoC!Q9)lp&p`ijB zH{nIx{|Ybo7C{;=TUMS)Qb2D~NXG&EY3`uZ8Vy=%15cn4Maz00iLT!qB*93{zIX90 z$0q3{NMq#xWp086ggf?tX$7(=7fz}{2#8rm0RZ9A`Hg5EQ7H*V zs{t4w2^Qviz*|5p9Uub~A=V3i{_pu~Z+MZNOoQMu;KeYVOhKp_u(_T#s)Qhb%+s2Y zQ(T(toIIfd%0mS_t@r4X1mR@BY@2BN0PBo3Ax@QdW-HaY%-*p!dUO@=)Ujk9982aw zTMA$Zgdl?L;wRISAyxU~8G}m%kNqDZ{m0=jT^q7Bg+`Vg{u(M2OZ1XzX+@*c=>B9D zaQyP6&z_I2U6%lB)WP4dcoJMTJRJbk~tFS2P}Q+}{r z--`zI;?S5d;{HmUIRt|MSj=r9bN@o#oq&rtdT7JCY8Vajg0u6DAHJQOk4I_uE`MncAA|s9SwiT#&x0cbfBPE5?!L4z^hpY20)x zGZK&XB{Lygx5StmU%Y!Iy>f@1ojs8sgv)txu0h00Y7XvuUTNGRKIgi%OS~|kzJjjs z$kwpXif@s2N>V3p@IQuwqP$?64yn%hZ$^To@cu3667jx|SiLxbHMP$^Ffu+xBj0Rw zQLFd8_?4fQF26!se;hcsODQpMD#&|Wvvw0cqWSa3%IpGFjh+_ugy36v)8CRYA0*>3 zMs3*Z!_zzRjwU5Pi>D7}#k! z50$V(KR)c9HZZ^aaA9t2$>-VF3^uS=?s)h`)37@pm;XFX4!HgcuS!b*o)Pw+fpbAl zb@il+o7S7t5e4qXBEja7p1oAY=x2_ZgMVz_#~QD<@>H%)KI?T;YE{iD_4v(_dfx(_ z9Z6={GXj^K?D$_zQv|JzmvzAKjpbEw78P608)@mUa~NQWuD<>nGgPUaH5}I;IqT|A zh~pb@O7@2e?{}*|3>o%i_>8r0YtCbHR)nU$>7~VZ61mG+FI6a*sTrWx_v939EF)GU zq#LMzOl>r#$7W}GgdB4(mpicQfF6~7K|M>HV}CeVqrtB84=>|>x#Gy+c~#lxEIFRe zIcEd)2ApY|NBsrJh0C1@c!PWWlu6UjV#6!;M8Xj3i0eM(eV7F=HSrS_6)mk$WREbR z2v)*kx1!&GVC3kZu;}Lp8dL&@aX$6`-|s}yuJ*UZi;NKensJx-7ps1JJ3uUe;U?6Z ztf?=%`Kszhe9MWWFBUhEUo;>i~f^hDDyCcVXepnIxWj`(EpE3A!7mEKSOV+aM8mR-QxUum9by% z;T?@%yR!Q|d6|Mw;zkf&YOHBS!P zUdp@1SUgl?D5(hMQ6>9+Kf`2HyDQxVOZzwA)AE!nh|Y26+Pora>N-`^{>EY)F6N6T Xr*l8D{mxuqq$tV>g*@rM1_1m6R-DC3 delta 2616 zcmZvcdpwlcAIG1|jF@JcaY-_Zp>d5GX$&<)E~%Z7Xi7+%mPmz|E-sB3mzYWJ^Q4gL zib^i4(MF?4WwqU?A+43xW!2_~7FqnBnfmSS>-YOTe>|_}ob!A>=e$4Xd(L>*vhf$o zGR865BaJSZQ!IFJ6wY=6H-qH*WN@tr%*eiRb|+X?gVuQCq8S;`1MsKE)ArgOf`{Lqal!4<(J@gX-0N#qA z1SVUq2f27u$`00nNJ$TQn>YGVO^AsjH~)X|+2i;L(u z=N&@b115u)C0F)<9WZak5+bGHty6YVNkIuW%Zwos5QR^rH&(->RJ$7Vjjn}6lvZ|H zqqcVq7g1bzgeWyXVv~dh@OzXUQCf?4Mll!6umBKC6k?KQ=nyHznW|8t)?ZX#JpL)> zwh}F*c&^-<|3=~5v4tpI&t~mFY57dWK+8&Ek|!D<%FQi9^!>pVV41|$AM8?9EIoxq zC5>U*(b>Q>4In7thtC8{OaB27B?q{m0QiYNpqQtJDE(@$fkvf%Zq5K>J?^F9QzJDvTG;{^@62a>YL5{>0qJ^#UJ@<3$2Z zp(G{;?tpdRMVbH_E`lKtf=GnX)#F_<(-f_BSQY;Z$5W86GT{&%E6a7X^)$ufvw}dg zL7P_Vtmw9MTOZnP#3BItZsz(XTlUEuaJXB1CJqBb76g6orj6r>*vAI ziCWG<+`XsU8ZR9%TC{V@k5#oH8FC_fxW*y#?l&oZ&vCOwWV832UHbcFy06|gS%u#J z@Vb-{c#fQnzu~3p7aK(1hZVXk9Cz>ciZ9_)3aV55N|dL6rOp0sz+i30{nX#C*Y<)l z%HP!BS!!MdMo*MfrO_97mxlHp!d|iq9h8b&7COI~br@b!RpYgbjYhS8A;c?${h3x`}#S(pdsvAoqDnPExX}UV@INA zHHVC@UH_2hC2=s%Z9G-A(B*l>H0t!`cec7Ehct)w+@c1{fOsd;8A5z01cLxr%I~1@ z?;|oX%s^ge!J&ub0>hw>=&u49BlXs4&hxsO~z~(Rkhw?!36e z7c1gj4x1!E- zdkvTD=GZ&lK%ne=aiRzj90-|Lc`O{~-cq^PGpoumy0CxU?P#bbCi!+rtH{9onime74-=}&N$LI|VwiGy;8?3Lt-Sx4 zQTkAfJ7NCW%!@9U2nUVx6rrUC2PiNX|aFi2ky4P zCZ(QZscjB6>ZWTXb=3~9=UhK3v%5lE`)ap7$K3n5iZh*c=#Q?N@^3ie*j~_9vhNa{ z5AtHFa?^^-x}Q|GPPTkBxx3cQb-5(3-lo5fyMn?Y2;v%fGMQmg_4L+?Fq$~g@!qFS zCDWB%C!Cu#)g^Ek)H>Os%J%IWg^p9?gs61L}AuA^Hr&|B2Tho<+p1IAJfLwe=fo#^=1=hf*O#S?aee?fBk~>?vfhG6Iyj7;xfd{@S8+Uw&F4j(c=HQyNH!IB@{7GG3 zyUnA)&9Ze3WAf$nN0m1*&T$PLOAGI8