remove -db / -pcap / -all gemspecs, merge into one
Brent Cook
parent
f8a215e3cd
commit
1b951b36fe
8
Gemfile
8
Gemfile
|
|
@ -11,10 +11,6 @@ group :coverage do
|
||||||
gem 'simplecov'
|
gem 'simplecov'
|
||||||
end
|
end
|
||||||
|
|
||||||
group :db do
|
|
||||||
gemspec name: 'metasploit-framework-db'
|
|
||||||
end
|
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
# Markdown formatting for yard
|
# Markdown formatting for yard
|
||||||
gem 'redcarpet'
|
gem 'redcarpet'
|
||||||
|
|
@ -38,10 +34,6 @@ group :development, :test do
|
||||||
gem 'rspec-rails' , '>= 2.12', '< 3.0.0'
|
gem 'rspec-rails' , '>= 2.12', '< 3.0.0'
|
||||||
end
|
end
|
||||||
|
|
||||||
group :pcap do
|
|
||||||
gemspec name: 'metasploit-framework-pcap'
|
|
||||||
end
|
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
# cucumber extension for testing command line applications, like msfconsole
|
# cucumber extension for testing command line applications, like msfconsole
|
||||||
gem 'aruba'
|
gem 'aruba'
|
||||||
|
|
|
||||||
18
Gemfile.lock
18
Gemfile.lock
|
|
@ -3,6 +3,7 @@ PATH
|
||||||
specs:
|
specs:
|
||||||
metasploit-framework (4.11.5)
|
metasploit-framework (4.11.5)
|
||||||
actionpack (>= 4.0.9, < 4.1.0)
|
actionpack (>= 4.0.9, < 4.1.0)
|
||||||
|
activerecord (>= 4.0.9, < 4.1.0)
|
||||||
activesupport (>= 4.0.9, < 4.1.0)
|
activesupport (>= 4.0.9, < 4.1.0)
|
||||||
bcrypt
|
bcrypt
|
||||||
filesize
|
filesize
|
||||||
|
|
@ -10,11 +11,16 @@ PATH
|
||||||
json
|
json
|
||||||
metasm (~> 1.0.2)
|
metasm (~> 1.0.2)
|
||||||
metasploit-concern (= 1.0.0)
|
metasploit-concern (= 1.0.0)
|
||||||
|
metasploit-credential (= 1.0.1)
|
||||||
metasploit-model (= 1.0.0)
|
metasploit-model (= 1.0.0)
|
||||||
metasploit-payloads (= 1.0.16)
|
metasploit-payloads (= 1.0.16)
|
||||||
|
metasploit_data_models (= 1.2.9)
|
||||||
msgpack
|
msgpack
|
||||||
|
network_interface (~> 0.0.1)
|
||||||
nokogiri
|
nokogiri
|
||||||
packetfu (= 1.1.11)
|
packetfu (= 1.1.11)
|
||||||
|
pcaprub
|
||||||
|
pg (>= 0.11)
|
||||||
railties
|
railties
|
||||||
rb-readline-r7
|
rb-readline-r7
|
||||||
recog (= 2.0.14)
|
recog (= 2.0.14)
|
||||||
|
|
@ -22,16 +28,6 @@ PATH
|
||||||
rubyzip (~> 1.1)
|
rubyzip (~> 1.1)
|
||||||
sqlite3
|
sqlite3
|
||||||
tzinfo
|
tzinfo
|
||||||
metasploit-framework-db (4.11.5)
|
|
||||||
activerecord (>= 4.0.9, < 4.1.0)
|
|
||||||
metasploit-credential (= 1.0.1)
|
|
||||||
metasploit-framework (= 4.11.5)
|
|
||||||
metasploit_data_models (= 1.2.9)
|
|
||||||
pg (>= 0.11)
|
|
||||||
metasploit-framework-pcap (4.11.5)
|
|
||||||
metasploit-framework (= 4.11.5)
|
|
||||||
network_interface (~> 0.0.1)
|
|
||||||
pcaprub
|
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
|
|
@ -242,8 +238,6 @@ DEPENDENCIES
|
||||||
factory_girl_rails (~> 4.5.0)
|
factory_girl_rails (~> 4.5.0)
|
||||||
fivemat (= 1.2.1)
|
fivemat (= 1.2.1)
|
||||||
metasploit-framework!
|
metasploit-framework!
|
||||||
metasploit-framework-db!
|
|
||||||
metasploit-framework-pcap!
|
|
||||||
pry
|
pry
|
||||||
rake (>= 10.0.0)
|
rake (>= 10.0.0)
|
||||||
redcarpet
|
redcarpet
|
||||||
|
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
source "http://rubygems.org"
|
|
||||||
gemspec
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
Kiss FFT library
|
|
||||||
==================
|
|
||||||
|
|
||||||
|
|
||||||
Copyright (c) 2003-2010 Mark Borgerding
|
|
||||||
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
||||||
|
|
||||||
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
|
||||||
* Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
Ruby wrapper layer
|
|
||||||
==================
|
|
||||||
|
|
||||||
Copyright (C) 2009-2012 H D Moore < hdm[at]rapid7.com >
|
|
||||||
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
||||||
|
|
||||||
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
|
||||||
* Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
require "bundler/gem_tasks"
|
|
||||||
|
|
@ -1,164 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (c) 2003-2010, Mark Borgerding
|
|
||||||
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
||||||
|
|
||||||
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
|
||||||
* Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* kiss_fft.h
|
|
||||||
defines kiss_fft_scalar as either short or a float type
|
|
||||||
and defines
|
|
||||||
typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
|
|
||||||
#include "kiss_fft.h"
|
|
||||||
#include <limits.h>
|
|
||||||
|
|
||||||
#define MAXFACTORS 32
|
|
||||||
/* e.g. an fft of length 128 has 4 factors
|
|
||||||
as far as kissfft is concerned
|
|
||||||
4*4*4*2
|
|
||||||
*/
|
|
||||||
|
|
||||||
struct kiss_fft_state{
|
|
||||||
int nfft;
|
|
||||||
int inverse;
|
|
||||||
int factors[2*MAXFACTORS];
|
|
||||||
kiss_fft_cpx twiddles[1];
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
Explanation of macros dealing with complex math:
|
|
||||||
|
|
||||||
C_MUL(m,a,b) : m = a*b
|
|
||||||
C_FIXDIV( c , div ) : if a fixed point impl., c /= div. noop otherwise
|
|
||||||
C_SUB( res, a,b) : res = a - b
|
|
||||||
C_SUBFROM( res , a) : res -= a
|
|
||||||
C_ADDTO( res , a) : res += a
|
|
||||||
* */
|
|
||||||
#ifdef FIXED_POINT
|
|
||||||
#if (FIXED_POINT==32)
|
|
||||||
# define FRACBITS 31
|
|
||||||
# define SAMPPROD int64_t
|
|
||||||
#define SAMP_MAX 2147483647
|
|
||||||
#else
|
|
||||||
# define FRACBITS 15
|
|
||||||
# define SAMPPROD int32_t
|
|
||||||
#define SAMP_MAX 32767
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define SAMP_MIN -SAMP_MAX
|
|
||||||
|
|
||||||
#if defined(CHECK_OVERFLOW)
|
|
||||||
# define CHECK_OVERFLOW_OP(a,op,b) \
|
|
||||||
if ( (SAMPPROD)(a) op (SAMPPROD)(b) > SAMP_MAX || (SAMPPROD)(a) op (SAMPPROD)(b) < SAMP_MIN ) { \
|
|
||||||
fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) ); }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
# define smul(a,b) ( (SAMPPROD)(a)*(b) )
|
|
||||||
# define sround( x ) (kiss_fft_scalar)( ( (x) + (1<<(FRACBITS-1)) ) >> FRACBITS )
|
|
||||||
|
|
||||||
# define S_MUL(a,b) sround( smul(a,b) )
|
|
||||||
|
|
||||||
# define C_MUL(m,a,b) \
|
|
||||||
do{ (m).r = sround( smul((a).r,(b).r) - smul((a).i,(b).i) ); \
|
|
||||||
(m).i = sround( smul((a).r,(b).i) + smul((a).i,(b).r) ); }while(0)
|
|
||||||
|
|
||||||
# define DIVSCALAR(x,k) \
|
|
||||||
(x) = sround( smul( x, SAMP_MAX/k ) )
|
|
||||||
|
|
||||||
# define C_FIXDIV(c,div) \
|
|
||||||
do { DIVSCALAR( (c).r , div); \
|
|
||||||
DIVSCALAR( (c).i , div); }while (0)
|
|
||||||
|
|
||||||
# define C_MULBYSCALAR( c, s ) \
|
|
||||||
do{ (c).r = sround( smul( (c).r , s ) ) ;\
|
|
||||||
(c).i = sround( smul( (c).i , s ) ) ; }while(0)
|
|
||||||
|
|
||||||
#else /* not FIXED_POINT*/
|
|
||||||
|
|
||||||
# define S_MUL(a,b) ( (a)*(b) )
|
|
||||||
#define C_MUL(m,a,b) \
|
|
||||||
do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
|
|
||||||
(m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
|
|
||||||
# define C_FIXDIV(c,div) /* NOOP */
|
|
||||||
# define C_MULBYSCALAR( c, s ) \
|
|
||||||
do{ (c).r *= (s);\
|
|
||||||
(c).i *= (s); }while(0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CHECK_OVERFLOW_OP
|
|
||||||
# define CHECK_OVERFLOW_OP(a,op,b) /* noop */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define C_ADD( res, a,b)\
|
|
||||||
do { \
|
|
||||||
CHECK_OVERFLOW_OP((a).r,+,(b).r)\
|
|
||||||
CHECK_OVERFLOW_OP((a).i,+,(b).i)\
|
|
||||||
(res).r=(a).r+(b).r; (res).i=(a).i+(b).i; \
|
|
||||||
}while(0)
|
|
||||||
#define C_SUB( res, a,b)\
|
|
||||||
do { \
|
|
||||||
CHECK_OVERFLOW_OP((a).r,-,(b).r)\
|
|
||||||
CHECK_OVERFLOW_OP((a).i,-,(b).i)\
|
|
||||||
(res).r=(a).r-(b).r; (res).i=(a).i-(b).i; \
|
|
||||||
}while(0)
|
|
||||||
#define C_ADDTO( res , a)\
|
|
||||||
do { \
|
|
||||||
CHECK_OVERFLOW_OP((res).r,+,(a).r)\
|
|
||||||
CHECK_OVERFLOW_OP((res).i,+,(a).i)\
|
|
||||||
(res).r += (a).r; (res).i += (a).i;\
|
|
||||||
}while(0)
|
|
||||||
|
|
||||||
#define C_SUBFROM( res , a)\
|
|
||||||
do {\
|
|
||||||
CHECK_OVERFLOW_OP((res).r,-,(a).r)\
|
|
||||||
CHECK_OVERFLOW_OP((res).i,-,(a).i)\
|
|
||||||
(res).r -= (a).r; (res).i -= (a).i; \
|
|
||||||
}while(0)
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef FIXED_POINT
|
|
||||||
# define KISS_FFT_COS(phase) floor(.5+SAMP_MAX * cos (phase))
|
|
||||||
# define KISS_FFT_SIN(phase) floor(.5+SAMP_MAX * sin (phase))
|
|
||||||
# define HALF_OF(x) ((x)>>1)
|
|
||||||
#elif defined(USE_SIMD)
|
|
||||||
# define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) )
|
|
||||||
# define KISS_FFT_SIN(phase) _mm_set1_ps( sin(phase) )
|
|
||||||
# define HALF_OF(x) ((x)*_mm_set1_ps(.5))
|
|
||||||
#else
|
|
||||||
# define KISS_FFT_COS(phase) (kiss_fft_scalar) cos(phase)
|
|
||||||
# define KISS_FFT_SIN(phase) (kiss_fft_scalar) sin(phase)
|
|
||||||
# define HALF_OF(x) ((x)*.5)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define kf_cexp(x,phase) \
|
|
||||||
do{ \
|
|
||||||
(x)->r = KISS_FFT_COS(phase);\
|
|
||||||
(x)->i = KISS_FFT_SIN(phase);\
|
|
||||||
}while(0)
|
|
||||||
|
|
||||||
|
|
||||||
/* a debugging function */
|
|
||||||
#define pcpx(c)\
|
|
||||||
fprintf(stderr,"%g + %gi\n",(double)((c)->r),(double)((c)->i) )
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef KISS_FFT_USE_ALLOCA
|
|
||||||
// define this to allow use of alloca instead of malloc for temporary buffers
|
|
||||||
// Temporary buffers are used in two case:
|
|
||||||
// 1. FFT sizes that have "bad" factors. i.e. not 2,3 and 5
|
|
||||||
// 2. "in-place" FFTs. Notice the quotes, since kissfft does not really do an in-place transform.
|
|
||||||
#include <alloca.h>
|
|
||||||
#define KISS_FFT_TMP_ALLOC(nbytes) alloca(nbytes)
|
|
||||||
#define KISS_FFT_TMP_FREE(ptr)
|
|
||||||
#else
|
|
||||||
#define KISS_FFT_TMP_ALLOC(nbytes) KISS_FFT_MALLOC(nbytes)
|
|
||||||
#define KISS_FFT_TMP_FREE(ptr) KISS_FFT_FREE(ptr)
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
require 'mkmf'
|
|
||||||
|
|
||||||
if(have_library("m"))
|
|
||||||
create_makefile("kissfft")
|
|
||||||
end
|
|
||||||
|
|
@ -1,408 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (c) 2003-2010, Mark Borgerding
|
|
||||||
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
||||||
|
|
||||||
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
|
||||||
* Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#include "_kiss_fft_guts.h"
|
|
||||||
/* The guts header contains all the multiplication and addition macros that are defined for
|
|
||||||
fixed or floating point complex numbers. It also delares the kf_ internal functions.
|
|
||||||
*/
|
|
||||||
|
|
||||||
static void kf_bfly2(
|
|
||||||
kiss_fft_cpx * Fout,
|
|
||||||
const size_t fstride,
|
|
||||||
const kiss_fft_cfg st,
|
|
||||||
int m
|
|
||||||
)
|
|
||||||
{
|
|
||||||
kiss_fft_cpx * Fout2;
|
|
||||||
kiss_fft_cpx * tw1 = st->twiddles;
|
|
||||||
kiss_fft_cpx t;
|
|
||||||
Fout2 = Fout + m;
|
|
||||||
do{
|
|
||||||
C_FIXDIV(*Fout,2); C_FIXDIV(*Fout2,2);
|
|
||||||
|
|
||||||
C_MUL (t, *Fout2 , *tw1);
|
|
||||||
tw1 += fstride;
|
|
||||||
C_SUB( *Fout2 , *Fout , t );
|
|
||||||
C_ADDTO( *Fout , t );
|
|
||||||
++Fout2;
|
|
||||||
++Fout;
|
|
||||||
}while (--m);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void kf_bfly4(
|
|
||||||
kiss_fft_cpx * Fout,
|
|
||||||
const size_t fstride,
|
|
||||||
const kiss_fft_cfg st,
|
|
||||||
const size_t m
|
|
||||||
)
|
|
||||||
{
|
|
||||||
kiss_fft_cpx *tw1,*tw2,*tw3;
|
|
||||||
kiss_fft_cpx scratch[6];
|
|
||||||
size_t k=m;
|
|
||||||
const size_t m2=2*m;
|
|
||||||
const size_t m3=3*m;
|
|
||||||
|
|
||||||
|
|
||||||
tw3 = tw2 = tw1 = st->twiddles;
|
|
||||||
|
|
||||||
do {
|
|
||||||
C_FIXDIV(*Fout,4); C_FIXDIV(Fout[m],4); C_FIXDIV(Fout[m2],4); C_FIXDIV(Fout[m3],4);
|
|
||||||
|
|
||||||
C_MUL(scratch[0],Fout[m] , *tw1 );
|
|
||||||
C_MUL(scratch[1],Fout[m2] , *tw2 );
|
|
||||||
C_MUL(scratch[2],Fout[m3] , *tw3 );
|
|
||||||
|
|
||||||
C_SUB( scratch[5] , *Fout, scratch[1] );
|
|
||||||
C_ADDTO(*Fout, scratch[1]);
|
|
||||||
C_ADD( scratch[3] , scratch[0] , scratch[2] );
|
|
||||||
C_SUB( scratch[4] , scratch[0] , scratch[2] );
|
|
||||||
C_SUB( Fout[m2], *Fout, scratch[3] );
|
|
||||||
tw1 += fstride;
|
|
||||||
tw2 += fstride*2;
|
|
||||||
tw3 += fstride*3;
|
|
||||||
C_ADDTO( *Fout , scratch[3] );
|
|
||||||
|
|
||||||
if(st->inverse) {
|
|
||||||
Fout[m].r = scratch[5].r - scratch[4].i;
|
|
||||||
Fout[m].i = scratch[5].i + scratch[4].r;
|
|
||||||
Fout[m3].r = scratch[5].r + scratch[4].i;
|
|
||||||
Fout[m3].i = scratch[5].i - scratch[4].r;
|
|
||||||
}else{
|
|
||||||
Fout[m].r = scratch[5].r + scratch[4].i;
|
|
||||||
Fout[m].i = scratch[5].i - scratch[4].r;
|
|
||||||
Fout[m3].r = scratch[5].r - scratch[4].i;
|
|
||||||
Fout[m3].i = scratch[5].i + scratch[4].r;
|
|
||||||
}
|
|
||||||
++Fout;
|
|
||||||
}while(--k);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void kf_bfly3(
|
|
||||||
kiss_fft_cpx * Fout,
|
|
||||||
const size_t fstride,
|
|
||||||
const kiss_fft_cfg st,
|
|
||||||
size_t m
|
|
||||||
)
|
|
||||||
{
|
|
||||||
size_t k=m;
|
|
||||||
const size_t m2 = 2*m;
|
|
||||||
kiss_fft_cpx *tw1,*tw2;
|
|
||||||
kiss_fft_cpx scratch[5];
|
|
||||||
kiss_fft_cpx epi3;
|
|
||||||
epi3 = st->twiddles[fstride*m];
|
|
||||||
|
|
||||||
tw1=tw2=st->twiddles;
|
|
||||||
|
|
||||||
do{
|
|
||||||
C_FIXDIV(*Fout,3); C_FIXDIV(Fout[m],3); C_FIXDIV(Fout[m2],3);
|
|
||||||
|
|
||||||
C_MUL(scratch[1],Fout[m] , *tw1);
|
|
||||||
C_MUL(scratch[2],Fout[m2] , *tw2);
|
|
||||||
|
|
||||||
C_ADD(scratch[3],scratch[1],scratch[2]);
|
|
||||||
C_SUB(scratch[0],scratch[1],scratch[2]);
|
|
||||||
tw1 += fstride;
|
|
||||||
tw2 += fstride*2;
|
|
||||||
|
|
||||||
Fout[m].r = Fout->r - HALF_OF(scratch[3].r);
|
|
||||||
Fout[m].i = Fout->i - HALF_OF(scratch[3].i);
|
|
||||||
|
|
||||||
C_MULBYSCALAR( scratch[0] , epi3.i );
|
|
||||||
|
|
||||||
C_ADDTO(*Fout,scratch[3]);
|
|
||||||
|
|
||||||
Fout[m2].r = Fout[m].r + scratch[0].i;
|
|
||||||
Fout[m2].i = Fout[m].i - scratch[0].r;
|
|
||||||
|
|
||||||
Fout[m].r -= scratch[0].i;
|
|
||||||
Fout[m].i += scratch[0].r;
|
|
||||||
|
|
||||||
++Fout;
|
|
||||||
}while(--k);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void kf_bfly5(
|
|
||||||
kiss_fft_cpx * Fout,
|
|
||||||
const size_t fstride,
|
|
||||||
const kiss_fft_cfg st,
|
|
||||||
int m
|
|
||||||
)
|
|
||||||
{
|
|
||||||
kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4;
|
|
||||||
int u;
|
|
||||||
kiss_fft_cpx scratch[13];
|
|
||||||
kiss_fft_cpx * twiddles = st->twiddles;
|
|
||||||
kiss_fft_cpx *tw;
|
|
||||||
kiss_fft_cpx ya,yb;
|
|
||||||
ya = twiddles[fstride*m];
|
|
||||||
yb = twiddles[fstride*2*m];
|
|
||||||
|
|
||||||
Fout0=Fout;
|
|
||||||
Fout1=Fout0+m;
|
|
||||||
Fout2=Fout0+2*m;
|
|
||||||
Fout3=Fout0+3*m;
|
|
||||||
Fout4=Fout0+4*m;
|
|
||||||
|
|
||||||
tw=st->twiddles;
|
|
||||||
for ( u=0; u<m; ++u ) {
|
|
||||||
C_FIXDIV( *Fout0,5); C_FIXDIV( *Fout1,5); C_FIXDIV( *Fout2,5); C_FIXDIV( *Fout3,5); C_FIXDIV( *Fout4,5);
|
|
||||||
scratch[0] = *Fout0;
|
|
||||||
|
|
||||||
C_MUL(scratch[1] ,*Fout1, tw[u*fstride]);
|
|
||||||
C_MUL(scratch[2] ,*Fout2, tw[2*u*fstride]);
|
|
||||||
C_MUL(scratch[3] ,*Fout3, tw[3*u*fstride]);
|
|
||||||
C_MUL(scratch[4] ,*Fout4, tw[4*u*fstride]);
|
|
||||||
|
|
||||||
C_ADD( scratch[7],scratch[1],scratch[4]);
|
|
||||||
C_SUB( scratch[10],scratch[1],scratch[4]);
|
|
||||||
C_ADD( scratch[8],scratch[2],scratch[3]);
|
|
||||||
C_SUB( scratch[9],scratch[2],scratch[3]);
|
|
||||||
|
|
||||||
Fout0->r += scratch[7].r + scratch[8].r;
|
|
||||||
Fout0->i += scratch[7].i + scratch[8].i;
|
|
||||||
|
|
||||||
scratch[5].r = scratch[0].r + S_MUL(scratch[7].r,ya.r) + S_MUL(scratch[8].r,yb.r);
|
|
||||||
scratch[5].i = scratch[0].i + S_MUL(scratch[7].i,ya.r) + S_MUL(scratch[8].i,yb.r);
|
|
||||||
|
|
||||||
scratch[6].r = S_MUL(scratch[10].i,ya.i) + S_MUL(scratch[9].i,yb.i);
|
|
||||||
scratch[6].i = -S_MUL(scratch[10].r,ya.i) - S_MUL(scratch[9].r,yb.i);
|
|
||||||
|
|
||||||
C_SUB(*Fout1,scratch[5],scratch[6]);
|
|
||||||
C_ADD(*Fout4,scratch[5],scratch[6]);
|
|
||||||
|
|
||||||
scratch[11].r = scratch[0].r + S_MUL(scratch[7].r,yb.r) + S_MUL(scratch[8].r,ya.r);
|
|
||||||
scratch[11].i = scratch[0].i + S_MUL(scratch[7].i,yb.r) + S_MUL(scratch[8].i,ya.r);
|
|
||||||
scratch[12].r = - S_MUL(scratch[10].i,yb.i) + S_MUL(scratch[9].i,ya.i);
|
|
||||||
scratch[12].i = S_MUL(scratch[10].r,yb.i) - S_MUL(scratch[9].r,ya.i);
|
|
||||||
|
|
||||||
C_ADD(*Fout2,scratch[11],scratch[12]);
|
|
||||||
C_SUB(*Fout3,scratch[11],scratch[12]);
|
|
||||||
|
|
||||||
++Fout0;++Fout1;++Fout2;++Fout3;++Fout4;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* perform the butterfly for one stage of a mixed radix FFT */
|
|
||||||
static void kf_bfly_generic(
|
|
||||||
kiss_fft_cpx * Fout,
|
|
||||||
const size_t fstride,
|
|
||||||
const kiss_fft_cfg st,
|
|
||||||
int m,
|
|
||||||
int p
|
|
||||||
)
|
|
||||||
{
|
|
||||||
int u,k,q1,q;
|
|
||||||
kiss_fft_cpx * twiddles = st->twiddles;
|
|
||||||
kiss_fft_cpx t;
|
|
||||||
int Norig = st->nfft;
|
|
||||||
|
|
||||||
kiss_fft_cpx * scratch = (kiss_fft_cpx*)KISS_FFT_TMP_ALLOC(sizeof(kiss_fft_cpx)*p);
|
|
||||||
|
|
||||||
for ( u=0; u<m; ++u ) {
|
|
||||||
k=u;
|
|
||||||
for ( q1=0 ; q1<p ; ++q1 ) {
|
|
||||||
scratch[q1] = Fout[ k ];
|
|
||||||
C_FIXDIV(scratch[q1],p);
|
|
||||||
k += m;
|
|
||||||
}
|
|
||||||
|
|
||||||
k=u;
|
|
||||||
for ( q1=0 ; q1<p ; ++q1 ) {
|
|
||||||
int twidx=0;
|
|
||||||
Fout[ k ] = scratch[0];
|
|
||||||
for (q=1;q<p;++q ) {
|
|
||||||
twidx += fstride * k;
|
|
||||||
if (twidx>=Norig) twidx-=Norig;
|
|
||||||
C_MUL(t,scratch[q] , twiddles[twidx] );
|
|
||||||
C_ADDTO( Fout[ k ] ,t);
|
|
||||||
}
|
|
||||||
k += m;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
KISS_FFT_TMP_FREE(scratch);
|
|
||||||
}
|
|
||||||
|
|
||||||
static
|
|
||||||
void kf_work(
|
|
||||||
kiss_fft_cpx * Fout,
|
|
||||||
const kiss_fft_cpx * f,
|
|
||||||
const size_t fstride,
|
|
||||||
int in_stride,
|
|
||||||
int * factors,
|
|
||||||
const kiss_fft_cfg st
|
|
||||||
)
|
|
||||||
{
|
|
||||||
kiss_fft_cpx * Fout_beg=Fout;
|
|
||||||
const int p=*factors++; /* the radix */
|
|
||||||
const int m=*factors++; /* stage's fft length/p */
|
|
||||||
const kiss_fft_cpx * Fout_end = Fout + p*m;
|
|
||||||
|
|
||||||
#ifdef _OPENMP
|
|
||||||
// use openmp extensions at the
|
|
||||||
// top-level (not recursive)
|
|
||||||
if (fstride==1 && p<=5)
|
|
||||||
{
|
|
||||||
int k;
|
|
||||||
|
|
||||||
// execute the p different work units in different threads
|
|
||||||
# pragma omp parallel for
|
|
||||||
for (k=0;k<p;++k)
|
|
||||||
kf_work( Fout +k*m, f+ fstride*in_stride*k,fstride*p,in_stride,factors,st);
|
|
||||||
// all threads have joined by this point
|
|
||||||
|
|
||||||
switch (p) {
|
|
||||||
case 2: kf_bfly2(Fout,fstride,st,m); break;
|
|
||||||
case 3: kf_bfly3(Fout,fstride,st,m); break;
|
|
||||||
case 4: kf_bfly4(Fout,fstride,st,m); break;
|
|
||||||
case 5: kf_bfly5(Fout,fstride,st,m); break;
|
|
||||||
default: kf_bfly_generic(Fout,fstride,st,m,p); break;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (m==1) {
|
|
||||||
do{
|
|
||||||
*Fout = *f;
|
|
||||||
f += fstride*in_stride;
|
|
||||||
}while(++Fout != Fout_end );
|
|
||||||
}else{
|
|
||||||
do{
|
|
||||||
// recursive call:
|
|
||||||
// DFT of size m*p performed by doing
|
|
||||||
// p instances of smaller DFTs of size m,
|
|
||||||
// each one takes a decimated version of the input
|
|
||||||
kf_work( Fout , f, fstride*p, in_stride, factors,st);
|
|
||||||
f += fstride*in_stride;
|
|
||||||
}while( (Fout += m) != Fout_end );
|
|
||||||
}
|
|
||||||
|
|
||||||
Fout=Fout_beg;
|
|
||||||
|
|
||||||
// recombine the p smaller DFTs
|
|
||||||
switch (p) {
|
|
||||||
case 2: kf_bfly2(Fout,fstride,st,m); break;
|
|
||||||
case 3: kf_bfly3(Fout,fstride,st,m); break;
|
|
||||||
case 4: kf_bfly4(Fout,fstride,st,m); break;
|
|
||||||
case 5: kf_bfly5(Fout,fstride,st,m); break;
|
|
||||||
default: kf_bfly_generic(Fout,fstride,st,m,p); break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* facbuf is populated by p1,m1,p2,m2, ...
|
|
||||||
where
|
|
||||||
p[i] * m[i] = m[i-1]
|
|
||||||
m0 = n */
|
|
||||||
static
|
|
||||||
void kf_factor(int n,int * facbuf)
|
|
||||||
{
|
|
||||||
int p=4;
|
|
||||||
double floor_sqrt;
|
|
||||||
floor_sqrt = floor( sqrt((double)n) );
|
|
||||||
|
|
||||||
/*factor out powers of 4, powers of 2, then any remaining primes */
|
|
||||||
do {
|
|
||||||
while (n % p) {
|
|
||||||
switch (p) {
|
|
||||||
case 4: p = 2; break;
|
|
||||||
case 2: p = 3; break;
|
|
||||||
default: p += 2; break;
|
|
||||||
}
|
|
||||||
if (p > floor_sqrt)
|
|
||||||
p = n; /* no more factors, skip to end */
|
|
||||||
}
|
|
||||||
n /= p;
|
|
||||||
*facbuf++ = p;
|
|
||||||
*facbuf++ = n;
|
|
||||||
} while (n > 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
*
|
|
||||||
* User-callable function to allocate all necessary storage space for the fft.
|
|
||||||
*
|
|
||||||
* The return value is a contiguous block of memory, allocated with malloc. As such,
|
|
||||||
* It can be freed with free(), rather than a kiss_fft-specific function.
|
|
||||||
* */
|
|
||||||
kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem )
|
|
||||||
{
|
|
||||||
kiss_fft_cfg st=NULL;
|
|
||||||
size_t memneeded = sizeof(struct kiss_fft_state)
|
|
||||||
+ sizeof(kiss_fft_cpx)*(nfft-1); /* twiddle factors*/
|
|
||||||
|
|
||||||
if ( lenmem==NULL ) {
|
|
||||||
st = ( kiss_fft_cfg)KISS_FFT_MALLOC( memneeded );
|
|
||||||
}else{
|
|
||||||
if (mem != NULL && *lenmem >= memneeded)
|
|
||||||
st = (kiss_fft_cfg)mem;
|
|
||||||
*lenmem = memneeded;
|
|
||||||
}
|
|
||||||
if (st) {
|
|
||||||
int i;
|
|
||||||
st->nfft=nfft;
|
|
||||||
st->inverse = inverse_fft;
|
|
||||||
|
|
||||||
for (i=0;i<nfft;++i) {
|
|
||||||
const double pi=3.141592653589793238462643383279502884197169399375105820974944;
|
|
||||||
double phase = -2*pi*i / nfft;
|
|
||||||
if (st->inverse)
|
|
||||||
phase *= -1;
|
|
||||||
kf_cexp(st->twiddles+i, phase );
|
|
||||||
}
|
|
||||||
|
|
||||||
kf_factor(nfft,st->factors);
|
|
||||||
}
|
|
||||||
return st;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void kiss_fft_stride(kiss_fft_cfg st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int in_stride)
|
|
||||||
{
|
|
||||||
if (fin == fout) {
|
|
||||||
//NOTE: this is not really an in-place FFT algorithm.
|
|
||||||
//It just performs an out-of-place FFT into a temp buffer
|
|
||||||
kiss_fft_cpx * tmpbuf = (kiss_fft_cpx*)KISS_FFT_TMP_ALLOC( sizeof(kiss_fft_cpx)*st->nfft);
|
|
||||||
kf_work(tmpbuf,fin,1,in_stride, st->factors,st);
|
|
||||||
memcpy(fout,tmpbuf,sizeof(kiss_fft_cpx)*st->nfft);
|
|
||||||
KISS_FFT_TMP_FREE(tmpbuf);
|
|
||||||
}else{
|
|
||||||
kf_work( fout, fin, 1,in_stride, st->factors,st );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
|
|
||||||
{
|
|
||||||
kiss_fft_stride(cfg,fin,fout,1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void kiss_fft_cleanup(void)
|
|
||||||
{
|
|
||||||
// nothing needed any more
|
|
||||||
}
|
|
||||||
|
|
||||||
int kiss_fft_next_fast_size(int n)
|
|
||||||
{
|
|
||||||
while(1) {
|
|
||||||
int m=n;
|
|
||||||
while ( (m%2) == 0 ) m/=2;
|
|
||||||
while ( (m%3) == 0 ) m/=3;
|
|
||||||
while ( (m%5) == 0 ) m/=5;
|
|
||||||
if (m<=1)
|
|
||||||
break; /* n is completely factorable by twos, threes, and fives */
|
|
||||||
n++;
|
|
||||||
}
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
@ -1,124 +0,0 @@
|
||||||
#ifndef KISS_FFT_H
|
|
||||||
#define KISS_FFT_H
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <math.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
ATTENTION!
|
|
||||||
If you would like a :
|
|
||||||
-- a utility that will handle the caching of fft objects
|
|
||||||
-- real-only (no imaginary time component ) FFT
|
|
||||||
-- a multi-dimensional FFT
|
|
||||||
-- a command-line utility to perform ffts
|
|
||||||
-- a command-line utility to perform fast-convolution filtering
|
|
||||||
|
|
||||||
Then see kfc.h kiss_fftr.h kiss_fftnd.h fftutil.c kiss_fastfir.c
|
|
||||||
in the tools/ directory.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef USE_SIMD
|
|
||||||
# include <xmmintrin.h>
|
|
||||||
# define kiss_fft_scalar __m128
|
|
||||||
#define KISS_FFT_MALLOC(nbytes) _mm_malloc(nbytes,16)
|
|
||||||
#define KISS_FFT_FREE _mm_free
|
|
||||||
#else
|
|
||||||
#define KISS_FFT_MALLOC malloc
|
|
||||||
#define KISS_FFT_FREE free
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef FIXED_POINT
|
|
||||||
#include <sys/types.h>
|
|
||||||
# if (FIXED_POINT == 32)
|
|
||||||
# define kiss_fft_scalar int32_t
|
|
||||||
# else
|
|
||||||
# define kiss_fft_scalar int16_t
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
# ifndef kiss_fft_scalar
|
|
||||||
/* default is float */
|
|
||||||
# define kiss_fft_scalar float
|
|
||||||
# endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef struct {
|
|
||||||
kiss_fft_scalar r;
|
|
||||||
kiss_fft_scalar i;
|
|
||||||
}kiss_fft_cpx;
|
|
||||||
|
|
||||||
typedef struct kiss_fft_state* kiss_fft_cfg;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* kiss_fft_alloc
|
|
||||||
*
|
|
||||||
* Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
|
|
||||||
*
|
|
||||||
* typical usage: kiss_fft_cfg mycfg=kiss_fft_alloc(1024,0,NULL,NULL);
|
|
||||||
*
|
|
||||||
* The return value from fft_alloc is a cfg buffer used internally
|
|
||||||
* by the fft routine or NULL.
|
|
||||||
*
|
|
||||||
* If lenmem is NULL, then kiss_fft_alloc will allocate a cfg buffer using malloc.
|
|
||||||
* The returned value should be free()d when done to avoid memory leaks.
|
|
||||||
*
|
|
||||||
* The state can be placed in a user supplied buffer 'mem':
|
|
||||||
* If lenmem is not NULL and mem is not NULL and *lenmem is large enough,
|
|
||||||
* then the function places the cfg in mem and the size used in *lenmem
|
|
||||||
* and returns mem.
|
|
||||||
*
|
|
||||||
* If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough),
|
|
||||||
* then the function returns NULL and places the minimum cfg
|
|
||||||
* buffer size in *lenmem.
|
|
||||||
* */
|
|
||||||
|
|
||||||
kiss_fft_cfg kiss_fft_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* kiss_fft(cfg,in_out_buf)
|
|
||||||
*
|
|
||||||
* Perform an FFT on a complex input buffer.
|
|
||||||
* for a forward FFT,
|
|
||||||
* fin should be f[0] , f[1] , ... ,f[nfft-1]
|
|
||||||
* fout will be F[0] , F[1] , ... ,F[nfft-1]
|
|
||||||
* Note that each element is complex and can be accessed like
|
|
||||||
f[k].r and f[k].i
|
|
||||||
* */
|
|
||||||
void kiss_fft(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
|
|
||||||
|
|
||||||
/*
|
|
||||||
A more generic version of the above function. It reads its input from every Nth sample.
|
|
||||||
* */
|
|
||||||
void kiss_fft_stride(kiss_fft_cfg cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout,int fin_stride);
|
|
||||||
|
|
||||||
/* If kiss_fft_alloc allocated a buffer, it is one contiguous
|
|
||||||
buffer and can be simply free()d when no longer needed*/
|
|
||||||
#define kiss_fft_free free
|
|
||||||
|
|
||||||
/*
|
|
||||||
Cleans up some memory that gets managed internally. Not necessary to call, but it might clean up
|
|
||||||
your compiler output to call this before you exit.
|
|
||||||
*/
|
|
||||||
void kiss_fft_cleanup(void);
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Returns the smallest integer k, such that k>=n and k has only "fast" factors (2,3,5)
|
|
||||||
*/
|
|
||||||
int kiss_fft_next_fast_size(int n);
|
|
||||||
|
|
||||||
/* for real ffts, we need an even size */
|
|
||||||
#define kiss_fftr_next_fast_size_real(n) \
|
|
||||||
(kiss_fft_next_fast_size( ((n)+1)>>1)<<1)
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,159 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (c) 2003-2004, Mark Borgerding
|
|
||||||
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
|
||||||
|
|
||||||
* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
|
|
||||||
* Neither the author nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "kiss_fftr.h"
|
|
||||||
#include "_kiss_fft_guts.h"
|
|
||||||
|
|
||||||
struct kiss_fftr_state{
|
|
||||||
kiss_fft_cfg substate;
|
|
||||||
kiss_fft_cpx * tmpbuf;
|
|
||||||
kiss_fft_cpx * super_twiddles;
|
|
||||||
#ifdef USE_SIMD
|
|
||||||
void * pad;
|
|
||||||
#endif
|
|
||||||
};
|
|
||||||
|
|
||||||
kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem,size_t * lenmem)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
kiss_fftr_cfg st = NULL;
|
|
||||||
size_t subsize, memneeded;
|
|
||||||
|
|
||||||
if (nfft & 1) {
|
|
||||||
fprintf(stderr,"Real FFT optimization must be even.\n");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
nfft >>= 1;
|
|
||||||
|
|
||||||
kiss_fft_alloc (nfft, inverse_fft, NULL, &subsize);
|
|
||||||
memneeded = sizeof(struct kiss_fftr_state) + subsize + sizeof(kiss_fft_cpx) * ( nfft * 3 / 2);
|
|
||||||
|
|
||||||
if (lenmem == NULL) {
|
|
||||||
st = (kiss_fftr_cfg) KISS_FFT_MALLOC (memneeded);
|
|
||||||
} else {
|
|
||||||
if (*lenmem >= memneeded)
|
|
||||||
st = (kiss_fftr_cfg) mem;
|
|
||||||
*lenmem = memneeded;
|
|
||||||
}
|
|
||||||
if (!st)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
st->substate = (kiss_fft_cfg) (st + 1); /*just beyond kiss_fftr_state struct */
|
|
||||||
st->tmpbuf = (kiss_fft_cpx *) (((char *) st->substate) + subsize);
|
|
||||||
st->super_twiddles = st->tmpbuf + nfft;
|
|
||||||
kiss_fft_alloc(nfft, inverse_fft, st->substate, &subsize);
|
|
||||||
|
|
||||||
for (i = 0; i < nfft/2; ++i) {
|
|
||||||
double phase =
|
|
||||||
-3.14159265358979323846264338327 * ((double) (i+1) / nfft + .5);
|
|
||||||
if (inverse_fft)
|
|
||||||
phase *= -1;
|
|
||||||
kf_cexp (st->super_twiddles+i,phase);
|
|
||||||
}
|
|
||||||
return st;
|
|
||||||
}
|
|
||||||
|
|
||||||
void kiss_fftr(kiss_fftr_cfg st,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata)
|
|
||||||
{
|
|
||||||
/* input buffer timedata is stored row-wise */
|
|
||||||
int k,ncfft;
|
|
||||||
kiss_fft_cpx fpnk,fpk,f1k,f2k,tw,tdc;
|
|
||||||
|
|
||||||
if ( st->substate->inverse) {
|
|
||||||
fprintf(stderr,"kiss fft usage error: improper alloc\n");
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
ncfft = st->substate->nfft;
|
|
||||||
|
|
||||||
/*perform the parallel fft of two real signals packed in real,imag*/
|
|
||||||
kiss_fft( st->substate , (const kiss_fft_cpx*)timedata, st->tmpbuf );
|
|
||||||
/* The real part of the DC element of the frequency spectrum in st->tmpbuf
|
|
||||||
* contains the sum of the even-numbered elements of the input time sequence
|
|
||||||
* The imag part is the sum of the odd-numbered elements
|
|
||||||
*
|
|
||||||
* The sum of tdc.r and tdc.i is the sum of the input time sequence.
|
|
||||||
* yielding DC of input time sequence
|
|
||||||
* The difference of tdc.r - tdc.i is the sum of the input (dot product) [1,-1,1,-1...
|
|
||||||
* yielding Nyquist bin of input time sequence
|
|
||||||
*/
|
|
||||||
|
|
||||||
tdc.r = st->tmpbuf[0].r;
|
|
||||||
tdc.i = st->tmpbuf[0].i;
|
|
||||||
C_FIXDIV(tdc,2);
|
|
||||||
CHECK_OVERFLOW_OP(tdc.r ,+, tdc.i);
|
|
||||||
CHECK_OVERFLOW_OP(tdc.r ,-, tdc.i);
|
|
||||||
freqdata[0].r = tdc.r + tdc.i;
|
|
||||||
freqdata[ncfft].r = tdc.r - tdc.i;
|
|
||||||
#ifdef USE_SIMD
|
|
||||||
freqdata[ncfft].i = freqdata[0].i = _mm_set1_ps(0);
|
|
||||||
#else
|
|
||||||
freqdata[ncfft].i = freqdata[0].i = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
for ( k=1;k <= ncfft/2 ; ++k ) {
|
|
||||||
fpk = st->tmpbuf[k];
|
|
||||||
fpnk.r = st->tmpbuf[ncfft-k].r;
|
|
||||||
fpnk.i = - st->tmpbuf[ncfft-k].i;
|
|
||||||
C_FIXDIV(fpk,2);
|
|
||||||
C_FIXDIV(fpnk,2);
|
|
||||||
|
|
||||||
C_ADD( f1k, fpk , fpnk );
|
|
||||||
C_SUB( f2k, fpk , fpnk );
|
|
||||||
C_MUL( tw , f2k , st->super_twiddles[k-1]);
|
|
||||||
|
|
||||||
freqdata[k].r = HALF_OF(f1k.r + tw.r);
|
|
||||||
freqdata[k].i = HALF_OF(f1k.i + tw.i);
|
|
||||||
freqdata[ncfft-k].r = HALF_OF(f1k.r - tw.r);
|
|
||||||
freqdata[ncfft-k].i = HALF_OF(tw.i - f1k.i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void kiss_fftri(kiss_fftr_cfg st,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata)
|
|
||||||
{
|
|
||||||
/* input buffer timedata is stored row-wise */
|
|
||||||
int k, ncfft;
|
|
||||||
|
|
||||||
if (st->substate->inverse == 0) {
|
|
||||||
fprintf (stderr, "kiss fft usage error: improper alloc\n");
|
|
||||||
exit (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
ncfft = st->substate->nfft;
|
|
||||||
|
|
||||||
st->tmpbuf[0].r = freqdata[0].r + freqdata[ncfft].r;
|
|
||||||
st->tmpbuf[0].i = freqdata[0].r - freqdata[ncfft].r;
|
|
||||||
C_FIXDIV(st->tmpbuf[0],2);
|
|
||||||
|
|
||||||
for (k = 1; k <= ncfft / 2; ++k) {
|
|
||||||
kiss_fft_cpx fk, fnkc, fek, fok, tmp;
|
|
||||||
fk = freqdata[k];
|
|
||||||
fnkc.r = freqdata[ncfft - k].r;
|
|
||||||
fnkc.i = -freqdata[ncfft - k].i;
|
|
||||||
C_FIXDIV( fk , 2 );
|
|
||||||
C_FIXDIV( fnkc , 2 );
|
|
||||||
|
|
||||||
C_ADD (fek, fk, fnkc);
|
|
||||||
C_SUB (tmp, fk, fnkc);
|
|
||||||
C_MUL (fok, tmp, st->super_twiddles[k-1]);
|
|
||||||
C_ADD (st->tmpbuf[k], fek, fok);
|
|
||||||
C_SUB (st->tmpbuf[ncfft - k], fek, fok);
|
|
||||||
#ifdef USE_SIMD
|
|
||||||
st->tmpbuf[ncfft - k].i *= _mm_set1_ps(-1.0);
|
|
||||||
#else
|
|
||||||
st->tmpbuf[ncfft - k].i *= -1;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
kiss_fft (st->substate, st->tmpbuf, (kiss_fft_cpx *) timedata);
|
|
||||||
}
|
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
#ifndef KISS_FTR_H
|
|
||||||
#define KISS_FTR_H
|
|
||||||
|
|
||||||
#include "kiss_fft.h"
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
|
|
||||||
Real optimized version can save about 45% cpu time vs. complex fft of a real seq.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
typedef struct kiss_fftr_state *kiss_fftr_cfg;
|
|
||||||
|
|
||||||
|
|
||||||
kiss_fftr_cfg kiss_fftr_alloc(int nfft,int inverse_fft,void * mem, size_t * lenmem);
|
|
||||||
/*
|
|
||||||
nfft must be even
|
|
||||||
|
|
||||||
If you don't care to allocate space, use mem = lenmem = NULL
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
void kiss_fftr(kiss_fftr_cfg cfg,const kiss_fft_scalar *timedata,kiss_fft_cpx *freqdata);
|
|
||||||
/*
|
|
||||||
input timedata has nfft scalar points
|
|
||||||
output freqdata has nfft/2+1 complex points
|
|
||||||
*/
|
|
||||||
|
|
||||||
void kiss_fftri(kiss_fftr_cfg cfg,const kiss_fft_cpx *freqdata,kiss_fft_scalar *timedata);
|
|
||||||
/*
|
|
||||||
input freqdata has nfft/2+1 complex points
|
|
||||||
output timedata has nfft scalar points
|
|
||||||
*/
|
|
||||||
|
|
||||||
#define kiss_fftr_free free
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
@ -1,155 +0,0 @@
|
||||||
/*
|
|
||||||
ruby-kissfft: a simple ruby module embedding the Kiss FFT library
|
|
||||||
Copyright (C) 2009-2010 Rapid7, Inc - H D Moore <hdm[at]metasploit.com>
|
|
||||||
|
|
||||||
Derived from "psdpng.c" from the KissFFT tools directory
|
|
||||||
Copyright (C) 2003-2006 Mark Borgerding
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "ruby.h"
|
|
||||||
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <math.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
|
|
||||||
#include "kiss_fft.h"
|
|
||||||
#include "kiss_fftr.h"
|
|
||||||
|
|
||||||
static VALUE rb_cKissFFT;
|
|
||||||
|
|
||||||
#define KISS_VERSION "1.2.8-1.0"
|
|
||||||
|
|
||||||
|
|
||||||
static VALUE
|
|
||||||
rbkiss_s_version(VALUE class)
|
|
||||||
{
|
|
||||||
return rb_str_new2(KISS_VERSION);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define CHECKNULL(p) if ( (p)==NULL ) do { fprintf(stderr,"CHECKNULL failed @ %s(%d): %s\n",__FILE__,__LINE__,#p );exit(1);} while(0)
|
|
||||||
|
|
||||||
static VALUE
|
|
||||||
rbkiss_s_fftr(VALUE class, VALUE r_nfft, VALUE r_rate, VALUE r_buckets, VALUE r_data)
|
|
||||||
{
|
|
||||||
kiss_fftr_cfg cfg=NULL;
|
|
||||||
kiss_fft_scalar *tbuf;
|
|
||||||
kiss_fft_cpx *fbuf;
|
|
||||||
float *mag2buf;
|
|
||||||
int i;
|
|
||||||
int avgctr=0;
|
|
||||||
int nrows=0;
|
|
||||||
|
|
||||||
int nfft;
|
|
||||||
int rate;
|
|
||||||
int navg;
|
|
||||||
int nfreqs;
|
|
||||||
|
|
||||||
int inp_len;
|
|
||||||
int inp_idx;
|
|
||||||
|
|
||||||
// Result set
|
|
||||||
VALUE res;
|
|
||||||
VALUE tmp;
|
|
||||||
VALUE set;
|
|
||||||
res = rb_ary_new();
|
|
||||||
|
|
||||||
if(TYPE(r_nfft) != T_FIXNUM) {
|
|
||||||
return Qnil;
|
|
||||||
}
|
|
||||||
nfft=NUM2INT(r_nfft);
|
|
||||||
|
|
||||||
if(TYPE(r_rate) != T_FIXNUM) {
|
|
||||||
return Qnil;
|
|
||||||
}
|
|
||||||
rate=NUM2INT(r_rate);
|
|
||||||
|
|
||||||
if(TYPE(r_buckets) != T_FIXNUM) {
|
|
||||||
return Qnil;
|
|
||||||
}
|
|
||||||
navg=NUM2INT(r_buckets);
|
|
||||||
|
|
||||||
if(TYPE(r_data) != T_ARRAY) {
|
|
||||||
return Qnil;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(RARRAY_LEN(r_data) == 0) {
|
|
||||||
return Qnil;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(TYPE(RARRAY_PTR(r_data)[0]) != T_FIXNUM ) {
|
|
||||||
return Qnil;
|
|
||||||
}
|
|
||||||
|
|
||||||
nfreqs=nfft/2+1;
|
|
||||||
|
|
||||||
CHECKNULL( cfg=kiss_fftr_alloc(nfft,0,0,0) );
|
|
||||||
CHECKNULL( tbuf=(kiss_fft_scalar*)malloc(sizeof(kiss_fft_scalar)*(nfft + 2) ) );
|
|
||||||
CHECKNULL( fbuf=(kiss_fft_cpx*)malloc(sizeof(kiss_fft_cpx)*(nfft + 2)) );
|
|
||||||
CHECKNULL( mag2buf=(float*)malloc(sizeof(float)*(nfft + 2) ));
|
|
||||||
|
|
||||||
memset(mag2buf,0,sizeof(mag2buf)*nfreqs);
|
|
||||||
|
|
||||||
inp_len = RARRAY_LEN(r_data);
|
|
||||||
inp_idx = 0;
|
|
||||||
|
|
||||||
while(inp_idx < inp_len) {
|
|
||||||
|
|
||||||
// Fill tbuf with nfft samples
|
|
||||||
for(i=0;i<nfft;i++) {
|
|
||||||
if(inp_idx + i >= inp_len) {
|
|
||||||
tbuf[i] = 0;
|
|
||||||
} else {
|
|
||||||
if(TYPE(RARRAY_PTR(r_data)[ inp_idx + i ]) != T_FIXNUM) {
|
|
||||||
tbuf[i] = 0;
|
|
||||||
} else {
|
|
||||||
tbuf[i] = NUM2INT( RARRAY_PTR(r_data)[ inp_idx + i ] );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* do FFT */
|
|
||||||
kiss_fftr(cfg,tbuf,fbuf);
|
|
||||||
|
|
||||||
for (i=0;i<nfreqs;++i) {
|
|
||||||
mag2buf[i] += fbuf[i].r * fbuf[i].r + fbuf[i].i * fbuf[i].i;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (++avgctr == navg) {
|
|
||||||
float eps = 1;
|
|
||||||
avgctr=0;
|
|
||||||
++nrows;
|
|
||||||
|
|
||||||
// RESULTS
|
|
||||||
set = rb_ary_new();
|
|
||||||
for (i=0;i<nfreqs;++i) {
|
|
||||||
float pwr = 10 * log10( mag2buf[i] / navg + eps );
|
|
||||||
tmp = rb_ary_new();
|
|
||||||
rb_ary_push(tmp, rb_float_new( (float)i * ( ( (float)rate / 2) / (float)nfreqs) ));
|
|
||||||
rb_ary_push(tmp, rb_float_new( pwr));
|
|
||||||
rb_ary_push(set, tmp);
|
|
||||||
}
|
|
||||||
rb_ary_push(res, set);
|
|
||||||
memset(mag2buf,0,sizeof(mag2buf[0])*nfreqs);
|
|
||||||
}
|
|
||||||
inp_idx += nfft;
|
|
||||||
}
|
|
||||||
|
|
||||||
free(cfg);
|
|
||||||
free(tbuf);
|
|
||||||
free(fbuf);
|
|
||||||
free(mag2buf);
|
|
||||||
return(res);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
Init_kissfft()
|
|
||||||
{
|
|
||||||
// KissFFT
|
|
||||||
rb_cKissFFT = rb_define_class("KissFFT", rb_cObject);
|
|
||||||
rb_define_module_function(rb_cKissFFT, "version", rbkiss_s_version, 0);
|
|
||||||
rb_define_module_function(rb_cKissFFT, "fftr", rbkiss_s_fftr, 4);
|
|
||||||
}
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
# -*- encoding: utf-8 -*-
|
|
||||||
|
|
||||||
Gem::Specification.new do |s|
|
|
||||||
s.name = "kissfft"
|
|
||||||
s.version = "0.0.1"
|
|
||||||
s.authors = ["HD Moore"]
|
|
||||||
s.email = ["hdm@rapid7.com"]
|
|
||||||
s.homepage = ""
|
|
||||||
s.summary = %q{Ruby wrapper around the KisFFT library for performing FFTs}
|
|
||||||
s.description = %q{Provides access to the KissFFT library for performing fast-fourier transforms from Ruby }
|
|
||||||
|
|
||||||
s.files = Dir.glob('lib/**/*.rb') + Dir.glob('ext/**/*.{c,h,rb}') + [ "LICENSE" ]
|
|
||||||
s.test_files = Dir.glob('test/**/*.{rb,data}')
|
|
||||||
s.extensions = [ 'ext/kissfft/extconf.rb' ]
|
|
||||||
s.require_paths = ["lib"]
|
|
||||||
end
|
|
||||||
Binary file not shown.
|
|
@ -1,47 +0,0 @@
|
||||||
#!/usr/bin/ruby
|
|
||||||
|
|
||||||
base = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
|
|
||||||
$:.unshift(File.join(File.dirname(base)))
|
|
||||||
|
|
||||||
require 'test/unit'
|
|
||||||
require 'kissfft'
|
|
||||||
require 'pp'
|
|
||||||
|
|
||||||
#
|
|
||||||
# Simple unit test
|
|
||||||
#
|
|
||||||
|
|
||||||
class KissFFT::UnitTest < Test::Unit::TestCase
|
|
||||||
def test_version
|
|
||||||
assert_equal(String, KissFFT.version.class)
|
|
||||||
puts "KissFFT version: #{KissFFT.version}"
|
|
||||||
end
|
|
||||||
def test_fftr
|
|
||||||
data = File.read('sample.data').unpack('s*')
|
|
||||||
|
|
||||||
min = 1
|
|
||||||
res = KissFFT.fftr(8192, 8000, 1, data)
|
|
||||||
|
|
||||||
tones = {}
|
|
||||||
res.each do |x|
|
|
||||||
rank = x.sort{|a,b| a[1].to_i <=> b[1].to_i }.reverse
|
|
||||||
rank[0..10].each do |t|
|
|
||||||
f = t[0].round
|
|
||||||
p = t[1].round
|
|
||||||
next if f == 0
|
|
||||||
next if p < min
|
|
||||||
tones[ f ] ||= []
|
|
||||||
tones[ f ] << t
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
tones.keys.sort.each do |t|
|
|
||||||
next if tones[t].length < 2
|
|
||||||
puts "#{t}hz"
|
|
||||||
tones[t].each do |x|
|
|
||||||
puts "\t#{x[0]}hz @ #{x[1]}"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
# coding: utf-8
|
|
||||||
|
|
||||||
# During build, the Gemfile is temporarily moved and
|
|
||||||
# we must manually define the project root
|
|
||||||
if ENV['MSF_ROOT']
|
|
||||||
lib = File.realpath(File.expand_path('lib', ENV['MSF_ROOT']))
|
|
||||||
else
|
|
||||||
# have to use realpath as metasploit-framework is often loaded through a symlink and tools like Coverage and debuggers
|
|
||||||
# require realpaths.
|
|
||||||
lib = File.realpath(File.expand_path('../lib', __FILE__))
|
|
||||||
end
|
|
||||||
|
|
||||||
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
||||||
require 'metasploit/framework/version'
|
|
||||||
require 'metasploit/framework/rails_version_constraint'
|
|
||||||
|
|
||||||
Gem::Specification.new do |spec|
|
|
||||||
spec.name = 'metasploit-framework-db'
|
|
||||||
spec.version = Metasploit::Framework::GEM_VERSION
|
|
||||||
spec.authors = ['Metasploit Hackers']
|
|
||||||
spec.email = ['metasploit-hackers@lists.sourceforge.net']
|
|
||||||
spec.summary = 'metasploit-framework Database dependencies'
|
|
||||||
spec.description = 'Gems needed to access the PostgreSQL database in metasploit-framework'
|
|
||||||
spec.homepage = 'https://www.metasploit.com'
|
|
||||||
spec.license = 'BSD-3-clause'
|
|
||||||
|
|
||||||
# no files, just dependencies
|
|
||||||
spec.files = []
|
|
||||||
|
|
||||||
spec.add_runtime_dependency 'activerecord', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
|
|
||||||
# Metasploit::Credential database models
|
|
||||||
spec.add_runtime_dependency 'metasploit-credential', '1.0.1'
|
|
||||||
# Database models shared between framework and Pro.
|
|
||||||
spec.add_runtime_dependency 'metasploit_data_models', '1.2.9'
|
|
||||||
# depend on metasploit-framewrok as the optional gems are useless with the actual code
|
|
||||||
spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}"
|
|
||||||
# Needed for module caching in Mdm::ModuleDetails
|
|
||||||
spec.add_runtime_dependency 'pg', '>= 0.11'
|
|
||||||
end
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
# coding: utf-8
|
|
||||||
|
|
||||||
# During build, the Gemfile is temporarily moved and
|
|
||||||
# we must manually define the project root
|
|
||||||
if ENV['MSF_ROOT']
|
|
||||||
lib = File.realpath(File.expand_path('lib', ENV['MSF_ROOT']))
|
|
||||||
else
|
|
||||||
# have to use realpath as metasploit-framework is often loaded through a symlink and tools like Coverage and debuggers
|
|
||||||
# require realpaths.
|
|
||||||
lib = File.realpath(File.expand_path('../lib', __FILE__))
|
|
||||||
end
|
|
||||||
|
|
||||||
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
||||||
require 'metasploit/framework/version'
|
|
||||||
require 'metasploit/framework/rails_version_constraint'
|
|
||||||
|
|
||||||
Gem::Specification.new do |spec|
|
|
||||||
spec.name = 'metasploit-framework-full'
|
|
||||||
spec.version = Metasploit::Framework::GEM_VERSION
|
|
||||||
spec.authors = ['Metasploit Hackers']
|
|
||||||
spec.email = ['metasploit-hackers@lists.sourceforge.net']
|
|
||||||
spec.summary = 'metasploit-framework with all optional dependencies'
|
|
||||||
spec.description = 'Gems needed to access the PostgreSQL database in metasploit-framework'
|
|
||||||
spec.homepage = 'https://www.metasploit.com'
|
|
||||||
spec.license = 'BSD-3-clause'
|
|
||||||
|
|
||||||
# no files, just dependencies
|
|
||||||
spec.files = []
|
|
||||||
|
|
||||||
metasploit_framework_version_constraint = "= #{spec.version}"
|
|
||||||
|
|
||||||
spec.add_runtime_dependency 'rails', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
|
|
||||||
spec.add_runtime_dependency 'metasploit-framework', metasploit_framework_version_constraint
|
|
||||||
spec.add_runtime_dependency 'metasploit-framework-db', metasploit_framework_version_constraint
|
|
||||||
spec.add_runtime_dependency 'metasploit-framework-pcap', metasploit_framework_version_constraint
|
|
||||||
end
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
# coding: utf-8
|
|
||||||
|
|
||||||
# During build, the Gemfile is temporarily moved and
|
|
||||||
# we must manually define the project root
|
|
||||||
if ENV['MSF_ROOT']
|
|
||||||
lib = File.realpath(File.expand_path('lib', ENV['MSF_ROOT']))
|
|
||||||
else
|
|
||||||
# have to use realpath as metasploit-framework is often loaded through a symlink and tools like Coverage and debuggers
|
|
||||||
# require realpaths.
|
|
||||||
lib = File.realpath(File.expand_path('../lib', __FILE__))
|
|
||||||
end
|
|
||||||
|
|
||||||
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
||||||
require 'metasploit/framework/version'
|
|
||||||
|
|
||||||
Gem::Specification.new do |spec|
|
|
||||||
spec.name = 'metasploit-framework-pcap'
|
|
||||||
spec.version = Metasploit::Framework::GEM_VERSION
|
|
||||||
spec.authors = ['Metasploit Hackers']
|
|
||||||
spec.email = ['metasploit-hackers@lists.sourceforge.net']
|
|
||||||
spec.summary = 'metasploit-framework packet capture dependencies'
|
|
||||||
spec.description = 'Gems needed to capture packets in metasploit-framework'
|
|
||||||
spec.homepage = 'https://www.metasploit.com'
|
|
||||||
spec.license = 'BSD-3-clause'
|
|
||||||
|
|
||||||
# no files, just dependencies
|
|
||||||
spec.files = []
|
|
||||||
|
|
||||||
# depend on metasploit-framewrok as the optional gems are useless with the actual code
|
|
||||||
spec.add_runtime_dependency 'metasploit-framework', "= #{spec.version}"
|
|
||||||
# get list of network interfaces, like eth* from OS.
|
|
||||||
spec.add_runtime_dependency 'network_interface', '~> 0.0.1'
|
|
||||||
# For sniffer and raw socket modules
|
|
||||||
spec.add_runtime_dependency 'pcaprub'
|
|
||||||
end
|
|
||||||
|
|
@ -44,7 +44,8 @@ Gem::Specification.new do |spec|
|
||||||
spec.test_files = spec.files.grep(%r{^spec/})
|
spec.test_files = spec.files.grep(%r{^spec/})
|
||||||
spec.require_paths = ["lib"]
|
spec.require_paths = ["lib"]
|
||||||
|
|
||||||
|
# Database support
|
||||||
|
spec.add_runtime_dependency 'activerecord', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
|
||||||
# Need 3+ for ActiveSupport::Concern
|
# Need 3+ for ActiveSupport::Concern
|
||||||
spec.add_runtime_dependency 'activesupport', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
|
spec.add_runtime_dependency 'activesupport', *Metasploit::Framework::RailsVersionConstraint::RAILS_VERSION
|
||||||
# Needed for config.action_view for view plugin compatibility for Pro
|
# Needed for config.action_view for view plugin compatibility for Pro
|
||||||
|
|
@ -59,6 +60,10 @@ Gem::Specification.new do |spec|
|
||||||
spec.add_runtime_dependency 'metasm', '~> 1.0.2'
|
spec.add_runtime_dependency 'metasm', '~> 1.0.2'
|
||||||
# Metasploit::Concern hooks
|
# Metasploit::Concern hooks
|
||||||
spec.add_runtime_dependency 'metasploit-concern', '1.0.0'
|
spec.add_runtime_dependency 'metasploit-concern', '1.0.0'
|
||||||
|
# Metasploit::Credential database models
|
||||||
|
spec.add_runtime_dependency 'metasploit-credential', '1.0.1'
|
||||||
|
# Database models shared between framework and Pro.
|
||||||
|
spec.add_runtime_dependency 'metasploit_data_models', '1.2.9'
|
||||||
# Things that would normally be part of the database model, but which
|
# Things that would normally be part of the database model, but which
|
||||||
# are needed when there's no database
|
# are needed when there's no database
|
||||||
spec.add_runtime_dependency 'metasploit-model', '1.0.0'
|
spec.add_runtime_dependency 'metasploit-model', '1.0.0'
|
||||||
|
|
@ -66,10 +71,16 @@ Gem::Specification.new do |spec|
|
||||||
spec.add_runtime_dependency 'metasploit-payloads', '1.0.16'
|
spec.add_runtime_dependency 'metasploit-payloads', '1.0.16'
|
||||||
# Needed by msfgui and other rpc components
|
# Needed by msfgui and other rpc components
|
||||||
spec.add_runtime_dependency 'msgpack'
|
spec.add_runtime_dependency 'msgpack'
|
||||||
|
# get list of network interfaces, like eth* from OS.
|
||||||
|
spec.add_runtime_dependency 'network_interface', '~> 0.0.1'
|
||||||
# Needed by anemone crawler
|
# Needed by anemone crawler
|
||||||
spec.add_runtime_dependency 'nokogiri'
|
spec.add_runtime_dependency 'nokogiri'
|
||||||
# Needed by db.rb and Msf::Exploit::Capture
|
# Needed by db.rb and Msf::Exploit::Capture
|
||||||
spec.add_runtime_dependency 'packetfu', '1.1.11'
|
spec.add_runtime_dependency 'packetfu', '1.1.11'
|
||||||
|
# For sniffer and raw socket modules
|
||||||
|
spec.add_runtime_dependency 'pcaprub'
|
||||||
|
# Needed for module caching in Mdm::ModuleDetails
|
||||||
|
spec.add_runtime_dependency 'pg', '>= 0.11'
|
||||||
# Run initializers for metasploit-concern, metasploit-credential, metasploit_data_models Rails::Engines
|
# Run initializers for metasploit-concern, metasploit-credential, metasploit_data_models Rails::Engines
|
||||||
spec.add_runtime_dependency 'railties'
|
spec.add_runtime_dependency 'railties'
|
||||||
# required for OS fingerprinting
|
# required for OS fingerprinting
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue