0
0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-01 19:05:18 +08:00

Merge branch 'master' of git@github.com:sustrik/zeromq2

This commit is contained in:
Martin Sustrik 2010-02-12 15:58:22 +01:00
commit 96e0442332
2 changed files with 4 additions and 3 deletions

View File

@ -100,8 +100,10 @@ int zmq::socket_base_t::bind (const char *addr_)
choose_io_thread (options.affinity), this, options);
zmq_assert (listener);
int rc = listener->set_address (addr_type.c_str(), addr_args.c_str ());
if (rc != 0)
if (rc != 0) {
delete listener;
return -1;
}
send_plug (listener);
send_own (this, listener);

View File

@ -35,14 +35,13 @@ namespace zmq
zmq_listener_t (class io_thread_t *parent_, socket_base_t *owner_,
const options_t &options_);
~zmq_listener_t ();
// Set address to listen on.
int set_address (const char* protocol_, const char *addr_);
private:
~zmq_listener_t ();
// Handlers for incoming commands.
void process_plug ();
void process_unplug ();