Changeset 1662

Show
Ignore:
Timestamp:
07/27/08 14:40:11 (1 month ago)
Author:
common
Message:

honeytrap

  • htm_cpuEmu fixes get the basics working
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • honeytrap/trunk/src/modules/htm_cpuEmu.c

    r1645 r1662  
    112112        case EMU_LOG_DEBUG: 
    113113                loglevel        = LL_DEBUG; 
     114                return; 
    114115                break; 
    115116        case EMU_LOG_NONE: 
    …… 
    117118                break; 
    118119        } 
    119         logmsg(loglevel, 1, "CPU Emulation - CPU reports: %s.\n", msg); 
     120        logmsg(loglevel, 1, "CPU Emulation - CPU reports: %s", msg); 
    120121 
    121122        return; 
    …… 
    140141        } 
    141142 
     143        emu_log_set_logcb(emu_logging_get(e), logmsg_emu); 
     144 
    142145        logmsg(LOG_NOISY, 1, "CPU Emulation - Analyzing %u bytes.\n", attack->a_conn.payload.size); 
    143146 
    …… 
    149152                // prepare emu for running shellcode 
    150153                e = emu_new(); 
     154                emu_log_set_logcb(emu_logging_get(e), logmsg_emu); 
    151155 
    152156                if ((opts.scode = malloc(attack->a_conn.payload.size)) == NULL) { 
    …… 
    507511 
    508512        socklen = sizeof(struct sockaddr); 
    509         if (getpeername(s, saddr, &socklen) == -1) { 
     513        if (getsockname(sockfd,&daddr, &socklen) == -1) { 
    510514                logmsg(LOG_ERR, 1, "CPU Emulation Error - Unable to get peer information: %s.\n", strerror(errno)); 
    511515                exit(EXIT_FAILURE); 
    512516        } 
    513517 
    514         if ((inet_ntop(AF_INET, saddr, shost, 16) == NULL) || 
    515             (inet_ntop(AF_INET, &daddr, dhost, 16) == NULL)) { 
     518        if ((inet_ntop(AF_INET, &((struct sockaddr_in *)saddr)->sin_addr, shost, 16) == NULL) || 
     519            (inet_ntop(AF_INET, &((struct sockaddr_in *)&daddr)->sin_addr, dhost, 16) == NULL)) { 
    516520                logmsg(LOG_ERR, 1, "CPU Emulation Error - Unable to convert IP address: %s.\n", strerror(errno)); 
    517521                exit(EXIT_FAILURE); 
    518522        }  
    519523 
    520         logmsg(LOG_NOISY, 1, "CPU Emulation - Connection accepted: %s:%u <- %s:%u.\n", shost, ((struct sockaddr_in *)saddr)->sin_port, dhost, ((struct sockaddr_in *)&daddr)->sin_port); 
     524        logmsg(LOG_NOISY, 1, "CPU Emulation - Connection accepted: %s:%u <- %s:%u.\n",  
     525                   shost, ((struct sockaddr_in *)saddr)->sin_port,  
     526                   dhost, ((struct sockaddr_in *)&daddr)->sin_port); 
    521527 
    522528