Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

This bug that this commit fixes causes getsockopt to randomly fail. The bug also makes memory overwrites possible. #30

Merged
merged 2 commits into from
Feb 28, 2012
Merged

This bug that this commit fixes causes getsockopt to randomly fail. The bug also makes memory overwrites possible. #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7657ef
Fix uninitialized variable 'option_len' in getsockopt. The parameter …
Feb 9, 2012
20f0fe8
Fix Dialyzer warnings
Feb 17, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions c_src/erlzmq_nif.c
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -394,6 +394,7 @@ NIF(erlzmq_nif_getsockopt)
case ZMQ_RECOVERY_IVL: case ZMQ_RECOVERY_IVL:
case ZMQ_RECOVERY_IVL_MSEC: case ZMQ_RECOVERY_IVL_MSEC:
case ZMQ_MCAST_LOOP: case ZMQ_MCAST_LOOP:
option_len = sizeof(value_int64);
enif_mutex_lock(socket->mutex); enif_mutex_lock(socket->mutex);
if (zmq_getsockopt(socket->socket_zmq, option_name, if (zmq_getsockopt(socket->socket_zmq, option_name,
&value_int64, &option_len)) { &value_int64, &option_len)) {
Expand All @@ -408,6 +409,7 @@ NIF(erlzmq_nif_getsockopt)
case ZMQ_AFFINITY: case ZMQ_AFFINITY:
case ZMQ_SNDBUF: case ZMQ_SNDBUF:
case ZMQ_RCVBUF: case ZMQ_RCVBUF:
option_len = sizeof(value_uint64);
enif_mutex_lock(socket->mutex); enif_mutex_lock(socket->mutex);
if (zmq_getsockopt(socket->socket_zmq, option_name, if (zmq_getsockopt(socket->socket_zmq, option_name,
&value_uint64, &option_len)) { &value_uint64, &option_len)) {
Expand All @@ -419,6 +421,7 @@ NIF(erlzmq_nif_getsockopt)
enif_make_uint64(env, value_uint64)); enif_make_uint64(env, value_uint64));
// binary // binary
case ZMQ_IDENTITY: case ZMQ_IDENTITY:
option_len = sizeof(option_value);
enif_mutex_lock(socket->mutex); enif_mutex_lock(socket->mutex);
if (zmq_getsockopt(socket->socket_zmq, option_name, if (zmq_getsockopt(socket->socket_zmq, option_name,
option_value, &option_len)) { option_value, &option_len)) {
Expand All @@ -437,6 +440,7 @@ NIF(erlzmq_nif_getsockopt)
case ZMQ_RECONNECT_IVL_MAX: case ZMQ_RECONNECT_IVL_MAX:
case ZMQ_BACKLOG: case ZMQ_BACKLOG:
case ZMQ_FD: // FIXME: ZMQ_FD returns SOCKET on Windows case ZMQ_FD: // FIXME: ZMQ_FD returns SOCKET on Windows
option_len = sizeof(value_int);
enif_mutex_lock(socket->mutex); enif_mutex_lock(socket->mutex);
if (zmq_getsockopt(socket->socket_zmq, option_name, if (zmq_getsockopt(socket->socket_zmq, option_name,
&value_int, &option_len)) { &value_int, &option_len)) {
Expand Down
2 changes: 1 addition & 1 deletion include/erlzmq.hrl
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
%% Possible types for an erlzmq socket.<br /> %% Possible types for an erlzmq socket.<br />
%% <i>For more information see %% <i>For more information see
%% <a href="http://api.zeromq.org/master:zmq_socket">zmq_socket</a></i> %% <a href="http://api.zeromq.org/master:zmq_socket">zmq_socket</a></i>
-type erlzmq_socket_type() :: pair | pub | sub | req | rep | xreq | xrep | -type erlzmq_socket_type() :: pair | pub | sub | req | rep | dealer | router | xreq | xrep |
pull | push | xpub | xsub. pull | push | xpub | xsub.


%% @type erlzmq_endpoint() = string(). %% @type erlzmq_endpoint() = string().
Expand Down
46 changes: 27 additions & 19 deletions src/erlzmq.erl
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -94,21 +94,29 @@ context(Threads) when is_integer(Threads) ->
erlzmq_error(). erlzmq_error().
socket(Context, Type) when is_atom(Type) -> socket(Context, Type) when is_atom(Type) ->
socket(Context, [Type]); socket(Context, [Type]);
socket(Context, [H | _] = L) -> socket(Context, [H | T]) when is_atom(H) ->
case lists:keytake(active, 1, L) of case T of
{value, {active, Active}, [Type]} when Active =:= true -> [] ->
true = (Type =/= pub) and (Type =/= push) and (Type =/= xpub),
erlzmq_nif:socket(Context, socket_type(Type), 1);
{value, {active, Active}, [Type]} when Active =:= false ->
erlzmq_nif:socket(Context, socket_type(Type), 0);
false when H =:= pub; H =:= push; H =:= xpub ->
% active is not used for these socket types
erlzmq_nif:socket(Context, socket_type(H), 0);
false ->
% active is false by default % active is false by default
% (to avoid latency on small messages (messages < 32KB)) % (to avoid latency on small messages (messages < 32KB))
erlzmq_nif:socket(Context, socket_type(H), 0) socket(Context, H, {active, false});
end. [Active] ->
socket(Context, H, Active)
end;
socket(Context, [H | [Type]]) when is_tuple(H) ->
socket(Context, Type, H).

-spec socket(Context :: erlzmq_context(),
Type :: erlzmq_socket_type(),
{active, boolean()}) ->
{ok, erlzmq_socket()} |
erlzmq_error().
socket(Context, Type, {active, true}) ->
true = (Type =/= pub) and (Type =/= push) and (Type =/= xpub),
erlzmq_nif:socket(Context, socket_type(Type), 1);
socket(Context, Type, {active, false}) ->
erlzmq_nif:socket(Context, socket_type(Type), 0).



%% @doc Accept connections on a socket. %% @doc Accept connections on a socket.
%% <br /> %% <br />
Expand Down Expand Up @@ -137,8 +145,8 @@ connect({I, Socket}, Endpoint)
erlzmq_nif:connect(Socket, Endpoint). erlzmq_nif:connect(Socket, Endpoint).


%% @equiv send(Socket, Msg, []) %% @equiv send(Socket, Msg, [])
-spec send(Socket :: erlzmq_socket(), -spec send(erlzmq_socket(),
Data :: erlzmq_data()) -> Binary :: binary()) ->
ok | ok |
erlzmq_error(). erlzmq_error().
send(Socket, Binary) when is_binary(Binary) -> send(Socket, Binary) when is_binary(Binary) ->
Expand All @@ -149,8 +157,8 @@ send(Socket, Binary) when is_binary(Binary) ->
%% <i>For more information see %% <i>For more information see
%% <a href="http://api.zeromq.org/master:zmq_send">zmq_send</a>.</i> %% <a href="http://api.zeromq.org/master:zmq_send">zmq_send</a>.</i>
%% @end %% @end
-spec send(Socket :: erlzmq_socket(), -spec send(erlzmq_socket(),
Data :: erlzmq_data(), Binary :: binary(),
Flags :: erlzmq_send_recv_flags()) -> Flags :: erlzmq_send_recv_flags()) ->
ok | ok |
erlzmq_error(). erlzmq_error().
Expand Down Expand Up @@ -205,9 +213,9 @@ recv({I, Socket}, Flags)
%% <i>For more information see %% <i>For more information see
%% <a href="http://api.zeromq.org/master:zmq_setsockopt">zmq_setsockopt</a>.</i> %% <a href="http://api.zeromq.org/master:zmq_setsockopt">zmq_setsockopt</a>.</i>
%% @end %% @end
-spec setsockopt(Socket :: erlzmq_socket(), -spec setsockopt(erlzmq_socket(),
Name :: erlzmq_sockopt(), Name :: erlzmq_sockopt(),
erlzmq_sockopt_value()) -> erlzmq_sockopt_value() | binary()) ->
ok | ok |
erlzmq_error(). erlzmq_error().
setsockopt(Socket, Name, Value) when is_list(Value) -> setsockopt(Socket, Name, Value) when is_list(Value) ->
Expand Down