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

Fixes #412. Still an issue with lorcon not yielding back when there is no traffic, but this is a different bug 

git-svn-id: file:///home/svn/framework3/trunk@7286 4d416f70-5f16-0410-b530-b9f4589650da
unstable
HD Moore 2009-10-26 22:36:24 +00:00
parent ddeb80e0da
commit b662d044a6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
external/ruby-lorcon2/Lorcon2.c vendored
View File

@ -214,10 +214,11 @@ static VALUE Lorcon_get_capiface(VALUE self) {
}
void Lorcon_packet_free(struct rlpack *rlp) {
/*
if (rlp->packet != NULL)
if (rlp->packet != NULL) {
lorcon_packet_free(rlp->packet);
*/
rlp->packet = NULL;
free(rlp);
}
}
static VALUE Lorcon_packet_create(int argc, VALUE *argv, VALUE self) {
@ -448,7 +449,6 @@ VALUE new_lorcon_packet(struct lorcon_packet *packet) {
obj = Data_Make_Struct(cPacket, struct rlpack, 0, Lorcon_packet_free, rlp);
rlp->packet = packet;
rb_obj_call_init(obj, 0, 0);
return(obj);
}
@ -535,16 +535,16 @@ static VALUE Lorcon_capture_loop(int argc, VALUE *argv, VALUE self) {
}
while (p < count || count <= 0) {
rb_thread_wait_fd(fd);
#ifndef RUBY_19
TRAP_BEG;
#endif
ret = lorcon_next_ex(rld->context, &packet);
#ifndef RUBY_19
#ifndef RUBY_19
TRAP_END;
#endif
#endif
/* timeout */
if (ret == 0)
continue;