Changeset 39310


Ignore:
Timestamp:
10/30/16 07:59:56 (7 years ago)
Author:
Stephan
Message:

next

Location:
titan/plugins/networkbrowser
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • titan/plugins/networkbrowser/netlib/nbtscan.c

    r22765 r39310  
    5151
    5252int print_header() {
    53   printf("%-17s%-17s%-10s%-17s%-17s\n", "IP address", "NetBIOS Name", 
     53  printf("%-17s%-17s%-10s%-17s%-17s\n", "IP address", "NetBIOS Name",
    5454         "Server", "User", "MAC address");
    5555  printf("------------------------------------------------------------------------------\n");
     
    8585        netinfo *nInfo = malloc(sizeof(netinfo)*255);
    8686        if(!nInfo)
    87                 return(NULL); // TODO: besser machen 
     87                return(NULL); // TODO: besser machen
    8888        memset(nInfo,0,sizeof(netinfo)*255);
    8989        return nInfo;
     
    9292void freeNetInfo(netinfo *nInfo)
    9393{
    94         free(nInfo); 
     94        free(nInfo);
    9595}
    9696
     
    101101int netzInfo(char *pythonIp, netinfo *nInfo) {
    102102  int timeout=10000, use137=0, bandwidth=0, send_ok=0;
    103   extern char *optarg;
    104   extern int optind;
     103  /*extern char *optarg;
     104  extern int optind;*/ /*unused*/
    105105  char* target_string=NULL;
    106106  char* filename =NULL;
     
    123123  float rtt; /* most recent measured RTT, seconds */
    124124  float srtt=0; /* smoothed rtt estimator, seconds */
    125   float rttvar=0.75; /* smoothed mean deviation, seconds */ 
     125  float rttvar=0.75; /* smoothed mean deviation, seconds */
    126126  double delta; /* used in retransmit timeout calculations */
    127127  int rto, retransmits=0, more_to_send=1, i;
     
    131131
    132132        if((target_string=strdup(pythonIp))==NULL)
    133         { 
     133        {
    134134                err_die("Malloc failed.\n", quiet);
    135135        }
     
    144144  /*****************************************/
    145145  sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
    146   if (sock < 0) 
     146  if (sock < 0)
    147147    err_die("Failed to create socket", quiet);
    148148
     
    150150  src_sockaddr.sin_family = AF_INET;
    151151  if(use137) src_sockaddr.sin_port = htons(NB_DGRAM);
    152   if (bind(sock, (struct sockaddr *)&src_sockaddr, sizeof(src_sockaddr)) == -1) 
     152  if (bind(sock, (struct sockaddr *)&src_sockaddr, sizeof(src_sockaddr)) == -1)
    153153    err_die("Failed to bind", quiet);
    154        
     154
    155155  fdsr=malloc(sizeof(fd_set));
    156156  if(!fdsr)  err_die("Malloc failed", quiet);
    157157  FD_ZERO(fdsr);
    158158  FD_SET(sock, fdsr);
    159        
     159
    160160  fdsw=malloc(sizeof(fd_set));
    161161  if(!fdsw)
     
    185185  buff=malloc(BUFFSIZE);
    186186  if(!buff)
    187   { 
     187  {
    188188        free(fdsw); fdsw = NULL;
    189189        free(fdsr); fdsr = NULL;
     
    191191        err_die("Malloc failed", quiet);
    192192  }
    193        
     193
    194194  /* Calculate interval between subsequent sends */
    195195
    196196  timerclear(&send_interval);
    197   if(bandwidth) send_interval.tv_usec = 
     197  if(bandwidth) send_interval.tv_usec =
    198198                  (NBNAME_REQUEST_SIZE + UDP_HEADER_SIZE + IP_HEADER_SIZE)*8*1000000 /
    199199                  bandwidth;  /* Send interval in microseconds */
     
    204204    send_interval.tv_usec = send_interval.tv_usec % 1000000;
    205205  }
    206        
     206
    207207  gettimeofday(&last_send_time, NULL); /* Get current time */
    208208
    209   rtt_base = last_send_time.tv_sec; 
     209  rtt_base = last_send_time.tv_sec;
    210210
    211211  /* Send queries, receive answers and print results */
    212212  /***************************************************/
    213        
     213
    214214  scanned = new_list();
    215215
     
    233233                                /* If this packet isn't a duplicate */
    234234        if(insert(scanned, ntohl(dest_sockaddr.sin_addr.s_addr))) {
    235           rtt = recv_time.tv_sec + 
    236             recv_time.tv_usec/1000000 - rtt_base - 
     235          rtt = recv_time.tv_sec +
     236            recv_time.tv_usec/1000000 - rtt_base -
    237237            hostinfo->header->transaction_id/1000;
    238           /* Using algorithm described in Stevens' 
     238          /* Using algorithm described in Stevens'
    239239             Unix Network Programming */
    240240          delta = rtt - srtt;
     
    256256
    257257  FD_ZERO(fdsr);
    258   FD_SET(sock, fdsr);           
     258  FD_SET(sock, fdsr);
    259259
    260260      /* check if send_interval time passed since last send */
     
    262262      timersub(&current_time, &last_send_time, &diff_time);
    263263      send_ok = timercmp(&diff_time, &send_interval, >=);
    264                        
    265                
     264
     265
    266266      if(more_to_send && FD_ISSET(sock, fdsw) && send_ok) {
    267267        if(targetlist) {
     
    271271              fprintf(stderr,"%s - bad IP address\n", str);
    272272            } else {
    273               if(!in_list(scanned, ntohl(next_in_addr->s_addr))) 
     273              if(!in_list(scanned, ntohl(next_in_addr->s_addr)))
    274274                send_query(sock, *next_in_addr, rtt_base);
    275275            }
    276276          } else {
    277277            if(feof(targetlist)) {
    278               more_to_send=0; 
     278              more_to_send=0;
    279279              FD_ZERO(fdsw);
    280280              /* timeout is in milliseconds */
     
    292292          }
    293293        } else if(next_address(&range, prev_in_addr, next_in_addr) ) {
    294           if(!in_list(scanned, ntohl(next_in_addr->s_addr))) 
     294          if(!in_list(scanned, ntohl(next_in_addr->s_addr)))
    295295            send_query(sock, *next_in_addr, rtt_base);
    296296          prev_in_addr=next_in_addr;
    297297          /* Update last send time */
    298           gettimeofday(&last_send_time, NULL); 
     298          gettimeofday(&last_send_time, NULL);
    299299        } else { /* No more queries to send */
    300           more_to_send=0; 
     300          more_to_send=0;
    301301          FD_ZERO(fdsw);
    302302          /* timeout is in milliseconds */
     
    305305          continue;
    306306        };
    307       };       
     307      };
    308308      if(more_to_send) {
    309309        FD_ZERO(fdsw);
     
    320320    if ( rto > 60.0 ) rto = 60.0;
    321321    gettimeofday(&now, NULL);
    322                
    323     if(now.tv_sec < (transmit_started.tv_sec+rto)) 
     322
     323    if(now.tv_sec < (transmit_started.tv_sec+rto))
    324324      sleep((transmit_started.tv_sec+rto)-now.tv_sec);
    325325    prev_in_addr = NULL ;
  • titan/plugins/networkbrowser/networkbrowser.c

    r39304 r39310  
    66#include "netlib/smbinfo.h"
    77#include "networkbrowser.h"
    8 #define INLINE
    98
    109char pluginname[] = "Networkbrowser";
Note: See TracChangeset for help on using the changeset viewer.