Commit 1bb39e39 authored by robertdavidgraham's avatar robertdavidgraham
Browse files

unicorn scan win32 fixes

parent 93a9c6c1

src/out-unicornscan.c

+17 −0
Original line number Diff line number Diff line
@@ -4,7 +4,12 @@ 
#include "masscan-status.h"

#include "unusedparm.h"





#ifndef WIN32

#include <netdb.h>

#else

#include <WinSock2.h>

#endif

#include <ctype.h>



static char * tcp_services[65536];
@@ -21,6 +26,7 @@ static void init_tcp_services() 


static char *tcp_service_name(int port)

{

#ifndef WIN32

    int r;

    struct servent result_buf;

    struct servent *result;
@@ -33,6 +39,16 @@ static char *tcp_service_name(int port) 
        return "unknown";



    return strdup(result_buf.s_name);

#else

    struct servent *result;



    result = getservbyport(htons((unsigned short)port), "tcp");



    if (result == NULL)

        return "unknown";



    return _strdup(result->s_name);

#endif

}



static void
@@ -57,6 +73,7 @@ unicornscan_out_status(struct Output *out, FILE *fp, time_t timestamp, 
{

    UNUSEDPARM(reason);

    UNUSEDPARM(out);

    UNUSEDPARM(timestamp);



    if (ip_proto == 6) {

      fprintf(fp,"TCP open\t%16s[%5d]\t\tfrom %u.%u.%u.%u  ttl %-3d\n",

vs10/masscan.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
    <ClCompile Include="..\src\out-null.c" />

    <ClCompile Include="..\src\out-redis.c" />

    <ClCompile Include="..\src\out-text.c" />

    <ClCompile Include="..\src\out-unicornscan.c" />

    <ClCompile Include="..\src\out-xml.c" />

    <ClCompile Include="..\src\pixie-backtrace.c" />

    <ClCompile Include="..\src\pixie-file.c" />

vs10/masscan.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -249,6 +249,9 @@ 
    <ClCompile Include="..\src\out-certs.c">

      <Filter>Source Files\output</Filter>

    </ClCompile>

    <ClCompile Include="..\src\out-unicornscan.c">

      <Filter>Source Files\output</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\src\proto-arp.h">