Skip to content

Commit

Permalink
Fix .so files loading
Browse files Browse the repository at this point in the history
  • Loading branch information
prefiks committed Dec 15, 2015
1 parent 26b73d4 commit a920b72
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
9 changes: 6 additions & 3 deletions rebar.config
Expand Up @@ -20,15 +20,18 @@
%%%
%%%----------------------------------------------------------------------

{require_min_otp_vsn, "16"}.
{require_min_otp_vsn, "R16"}.

{erl_opts, [debug_info, {src_dirs, ["src"]}]}.

{port_env, [{"CFLAGS", "$CFLAGS"}, {"LDFLAGS", "$LDFLAGS"}]}.
{port_env, [{"CFLAGS", "$CFLAGS"}, {"LDFLAGS", "$LDFLAGS -lssl -lcrypto"}]}.

{port_specs, [{"priv/lib/p1_tls_drv.so", ["c_src/p1_tls_drv.c"]},
{"priv/lib/p1_sha.so", ["c_src/p1_sha.c"]}]}.

{deps, [{p1_utils, ".*", {git, "git://github.com/processone/p1_utils", {tag, "1.0.2"}}}]}.

{clean_files, ["c_src/p1_tls.gcda", "c_src/p1_tls.gcno",
{clean_files, ["c_src/p1_tls_drv.gcda", "c_src/p1_tls_drv.gcno",
"c_src/p1_sha.gcda", "c_src/p1_sha.gcno"]}.

{cover_enabled, true}.
Expand Down
9 changes: 3 additions & 6 deletions src/p1_tls.erl
Expand Up @@ -402,13 +402,10 @@ cert_verify_code(X) ->
integer_to_binary(I) ->
list_to_binary(integer_to_list(I)).

get_so_path() ->
EbinDir = filename:dirname(code:which(?MODULE)),
AppDir = filename:dirname(EbinDir),
filename:join([AppDir, "priv", "lib"]).

load_driver() ->
case erl_ddll:load_driver(get_so_path(), p1_tls_drv) of
SOPath = p1_nif_utils:get_so_path(p1_tls, [fast_tls, p1_tls], "p1_tls_drv"),
Dir = filename:dirname(SOPath),
case erl_ddll:load_driver(Dir, "p1_tls_drv") of
ok ->
ok;
{error, already_loaded} ->
Expand Down

0 comments on commit a920b72

Please sign in to comment.