diff --git a/CMakeLists.txt.in b/CMakeLists.txt.in index 5c490c8..8415877 100644 --- a/CMakeLists.txt.in +++ b/CMakeLists.txt.in @@ -15,8 +15,8 @@ set(CPACK_PACKAGE_CONTACT "zhuzhenjun@geedgenetworks.com") set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") install(DIRECTORY @prefix@/include DESTINATION . USE_SOURCE_PERMISSIONS) -install(DIRECTORY @prefix@/lib DESTINATION /usr/lib64 USE_SOURCE_PERMISSIONS) -install(DIRECTORY @prefix@/bin DESTINATION . USE_SOURCE_PERMISSIONS) -install(FILES fp.json DESTINATION var/lib/libosfp) +install(DIRECTORY @prefix@/lib/ DESTINATION ./lib64 USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "libosfp*") +install(DIRECTORY @prefix@/bin DESTINATION . USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "osfp*") +install(FILES fp.json DESTINATION /var/lib/libosfp) include(CPack) diff --git a/README.md b/README.md index a5ad151..57661c9 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,19 @@ Libosfp is a C library for OS fingerprinting. # osfp_example depends on libpcap yum install -y libpcap-devel # build and install +./build.sh ./package.sh yum install package/*.rpm ``` +## library usage +``` +gcc example/sample.c -o sample -losfp; cat example/sample.c +``` + ## run example ``` # load the fingerprint file and capture on eth0, filter tcp port 8888 -osfp_example -f /usr/var/lib/libosfp/fp.json -i eth0 "tcp port 8888" +osfp_example -f /var/lib/libosfp/fp.json -i eth0 "tcp port 8888" ``` diff --git a/configure.ac b/configure.ac index c89ea71..22493eb 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([libosfp],[0.0.5],[zhuzhenjun@geedgenetworks.com]) +AC_INIT([libosfp],[1.0.0],[zhuzhenjun@geedgenetworks.com]) AM_INIT_AUTOMAKE([foreign]) #m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])AM_SILENT_RULES([yes]) diff --git a/example/Makefile.am b/example/Makefile.am index e2524ba..af3077a 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -1,4 +1,4 @@ -bin_PROGRAMS = osfp_example sample +bin_PROGRAMS = osfp_example osfp_example_SOURCES = \ osfp_example.c @@ -12,12 +12,3 @@ osfp_example_LDFLAGS = \ osfp_example_CFLAGS = \ -I../src - -sample_SOURCES = \ - sample.c - -sample_LDADD = \ - ../src/.libs/libosfp.la - -sample_CFLAGS = \ - -I../src diff --git a/example/sample.c b/example/sample.c index a238390..096dd80 100644 --- a/example/sample.c +++ b/example/sample.c @@ -1,5 +1,5 @@ #include "stdio.h" -#include "osfp.h" +#include "libosfp/osfp.h" char iph[] = { 0x45, 0x00, 0x00, 0x34, 0x51, 0xc4, 0x40, 0x00, diff --git a/package.sh b/package.sh index ddfd8ba..1d04589 100755 --- a/package.sh +++ b/package.sh @@ -1,9 +1,5 @@ #!/bin/bash -./autogen.sh; -./configure --prefix=$(pwd)/target; -make install; - rm -rf package mkdir package cd package