infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #162 from jduck/master 

This fixes #6334 (BTW MM IS LAZY!)
unstable
jlee-r7 2012-02-06 10:07:28 -08:00
parent b03e752fab 1a6cbd2bf0
commit 272591b3d3
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
external/source/meterpreter/source/common/arch/posix/scheduler.c vendored
View File

@ -58,8 +58,8 @@ DWORD scheduler_destroy( VOID )
polltable = NULL;
nentries = ntableentries = 0;
}
dprintf("[%s] Now for the fun part, iterating through list and removing items");
dprintf("[%s] Now for the fun part, iterating through list and removing items", __FUNCTION__);
LIST_FOREACH_SAFE(current, &WEHead, link, tmp)
{
@ -84,7 +84,7 @@ DWORD scheduler_destroy( VOID )
DWORD scheduler_initialize( Remote * remote )
{
if(scheduler_thread) {
dprintf("[%s] Hmmm. scheduler_initialize() called twice?");
dprintf("[%s] Hmmm. scheduler_initialize() called twice?", __FUNCTION__);
return ERROR_SUCCESS;
}

4
external/source/meterpreter/source/extensions/sniffer/sniffer.c vendored
View File

@ -74,7 +74,7 @@ char *get_interface_name_by_index(unsigned int fidx)
interfaces = int_iter = NULL;
if(pcap_findalldevs(&interfaces, errbuf) == -1) {
dprintf("[%s] Hmm, out of memory? (errno = %d, but probably not useful)", errno);
dprintf("[%s] Hmm, out of memory? (errno = %d, but probably not useful)", __FUNCTION__, errno);
return NULL;
}
@ -399,7 +399,7 @@ void packet_handler(u_char *user, const struct pcap_pkthdr *h, const u_char *byt
pkt = calloc(sizeof(PeterPacket) + h->caplen, 1);
if(! pkt) {
dprintf("[%s] ho hum, no memory. maybe a pcap_breakloop / stop running?");
dprintf("[%s] ho hum, no memory. maybe a pcap_breakloop / stop running?", __FUNCTION__);
return;
}

2
external/source/meterpreter/source/server/linux/netlink.c vendored
View File

@ -144,7 +144,7 @@ int netlink_parse(int fd, int seq, netlink_cb_t callback, void *data)
if(nh->nlmsg_type == NLMSG_ERROR) {
struct nlmsgerr *me = (struct nlmsgerr *) NLMSG_DATA (nh);
dprintf("[%s] in NLMSG_ERROR handling.. me = %p", __FUNCTION__);
dprintf("[%s] in NLMSG_ERROR handling.. me = %p", __FUNCTION__, me);
dprintf("[%s] me->error = %d", __FUNCTION__, me->error);
if(me->error) {
dprintf("[%s] so, we have: nlmsg_len: %d, nlmsg_type: %d, nlmsg_flags: %d, nlmsg_seq: %d, nlmsg_pid: %d",

2
external/source/meterpreter/source/server/rtld/Makefile vendored
View File

@ -53,7 +53,7 @@ metsrv_rtld.o: libc.h libm.h libcrypto.h libssl.h libmetsrv_main.h libsupport.h
rtldtest: rtldtest.c msflinker
gcc -march=i386 -m32 -o rtldtest rtldtest.c -DEP=`objdump -f msflinker | grep start | awk '{ print $$3 }'`
.s.o:
.S.o:
gcc $(CFLAGS) -c $<
.c.o:

2
external/source/meterpreter/source/server/server_setup.c vendored
View File

@ -133,7 +133,7 @@ static VOID server_socket_flush( Remote * remote )
break;
ret = recv(fd, buff, sizeof(buff), 0);
dprintf("[SERVER] Flushed %d bytes from the buffer");
dprintf("[SERVER] Flushed %d bytes from the buffer", ret);
// The socket closed while we waited
if(ret == 0) {