libcouchbase 1.3.0 → 1.3.2

data/ext/libcouchbase/include/libcouchbase/vbucket.h

@@ -52,7 +52,9 @@ typedef enum {
     LCBVB_SVCTYPE_IXADMIN, /**< Index administration */
     LCBVB_SVCTYPE_N1QL, /**< N1QL Query */
     LCBVB_SVCTYPE_FTS, /**< Fulltext */
-    LCBVB_SVCTYPE_CBAS, /**< Analytics Query */
+    LCBVB_SVCTYPE_ANALYTICS, /**< Analytics Query */
+    /* for backward compatiblity */
+#define LCBVB_SVCTYPE_CBAS LCBVB_SVCTYPE_ANALYTICS
     LCBVB_SVCTYPE__MAX
 } lcbvb_SVCTYPE;
 
@@ -101,6 +103,9 @@ typedef struct {
     char *ftspath; /**< Path prefix for fulltext queries */
     char *cbaspath; /**< Path prefix for analytics queries */
     unsigned nvbs; /**< Total number of vbuckets the server has assigned */
+    char *alt_hostname; /**< selected alternative hostname for the node */
+    lcbvb_SERVICES alt_svc; /**< selected alternative plain services */
+    lcbvb_SERVICES alt_svc_ssl; /**< selected alternative SSL Services */
 } lcbvb_SERVER;
 
 /**@volatile. ABI/API compatibility not guaranteed between versions */
@@ -194,6 +199,13 @@ lcbvb_parse_json(const char *data);
  * Load a JSON-based configuration string into a configuration object
  * @param vbc Object to populate
  * @param data NUL-terminated string to parse
+ * @param source hostname of the node, which emitted configuration. Pointer
+ *   to NULL will disable heuristic when network argument is pointer to NULL
+ *   string.
+ * @param network pointer to string, which specified key in alternative
+ *   addresses dict. Use pointer NULL string to trigger heuristic, in this
+ *   case, the function will try to match configuration source address to
+ *   the list of addresses to determine best network.
  * @return 0 on success, nonzero on failure
  * @note it is recommended to use this function rather than lcbvb_parse_json()
  *  as this will contain the error string in the configuration in case of parse
@@ -203,6 +215,14 @@ LIBCOUCHBASE_API
 int
 lcbvb_load_json(lcbvb_CONFIG *vbc, const char *data);
 
+
+/**
+ * @uncommmitted
+ */
+LIBCOUCHBASE_API
+int
+lcbvb_load_json_ex(lcbvb_CONFIG *vbc, const char *data, const char *source, char **network);
+
 /**@brief Serialize the current config as a JSON string.
  * @volatile
  * Serialize the current configuration as a JSON string. The string returned is

data/ext/libcouchbase/include/libcouchbase/views.h

@@ -37,6 +37,9 @@ extern "C" {
 namespace lcb { namespace views { struct ViewRequest; } }
 typedef lcb::views::ViewRequest* lcb_VIEWHANDLE;
 #else
+/**
+ * Pointer for request instance
+ */
 typedef struct lcbview_REQUEST_st *lcb_VIEWHANDLE;
 #endif
 
@@ -294,17 +297,59 @@ lcb_view_query_initcmd(lcb_CMDVIEWQUERY *vq,
 LIBCOUCHBASE_API
 void
 lcb_view_cancel(lcb_t instance, lcb_VIEWHANDLE handle);
+/**@}*/
 
+
+/**
+ * @ingroup lcb-public-api
+ * @addtogroup lcb-tracing-api
+ * @{
+ */
 #ifdef LCB_TRACING
+
 /**
- * @uncommitted
+ * Associate parent tracing span with the View request.
+ *
+ * @param instance the instance
+ * @param handle View request handle
+ * @param span parent span
+ *
+ * @par Attach parent tracing span to view request object.
+ * @code{.c}
+ * lcb_CMDVIEWQUERY vcmd = {0};
+ * char *doc_name = "beer";
+ * char *view_name = "by_location";
+ * char *options = "reduce=false&limit=3";
+ *
+ * vcmd.callback = view_callback;
+ * vcmd.ddoc = doc_name;
+ * vcmd.nddoc = strlen(doc_name);
+ * vcmd.view = view_name;
+ * vcmd.nview = strlen(view_name);
+ * vcmd.optstr = options;
+ * vcmd.noptstr = strlen(options);
+ * vcmd.cmdflags = LCB_CMDVIEWQUERY_F_INCLUDE_DOCS;
+ *
+ * lcb_VIEWHANDLE handle;
+ * vcmd.handle = &handle;
+ *
+ * err = lcb_view_query(instance, NULL, &vcmd);
+ * if (err != LCB_SUCCESS) {
+ *     die(instance, "Couldn't schedule view operation", err);
+ * }
+ * lcb_view_set_parent_span(instance, handle, span);
+ * @endcode
+ *
+ * @see @ref example/tracing/views.c
+ * @committed
  */
 LIBCOUCHBASE_API
 void lcb_view_set_parent_span(lcb_t instance, lcb_VIEWHANDLE handle, lcbtrace_SPAN *span);
-#endif
-
-/**@}*/
 
+#endif
+/**
+ * @} (Group: Tracing)
+ */
 #ifdef __cplusplus
 }
 #endif

data/ext/libcouchbase/packaging/deb/control

@@ -10,7 +10,7 @@ Vcs-Git: git://github.com/couchbase/libcouchbase.git
 
 Package: libcouchbase2-libevent
 Architecture: any
-Depends: libevent-1.4-2 (>= 1.4) | libevent-2.0-5 (>= 2.0), libcouchbase2-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libcouchbase2-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
 Description: library for the Couchbase protocol (libevent backend)
  libcouchbase is a library implementing Couchbase protocol.
@@ -19,7 +19,7 @@ Description: library for the Couchbase protocol (libevent backend)
 
 Package: libcouchbase2-libev
 Architecture: any
-Depends: libev3 (>= 3) | libev4 (>= 4), libcouchbase2-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libcouchbase2-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Multi-Arch: same
 Description: library for the Couchbase protocol (libev backend)
  libcouchbase is a library implementing Couchbase protocol.
@@ -70,4 +70,3 @@ Description: library for the Couchbase protocol
  libcouchbase is a library implementing Couchbase protocol.
  .
  This package provides the cbc tools built on libcouchbase library.
-

data/ext/libcouchbase/packaging/parse-git-describe.pl

@@ -47,7 +47,7 @@ if ($WantHelp) {
 
 my $output;
 if (!$Input) {
-    $output = qx(git describe --long);
+    $output = qx(git describe --long --abbrev=10);
 } else {
     $output = $Input;
 }

data/ext/libcouchbase/plugins/io/libev/CMakeLists.txt

@@ -1,8 +1,10 @@
-INSTALL(
-    FILES
-    libev_io_opts.h
-    DESTINATION
-    include/libcouchbase)
+IF(LCB_INSTALL_HEADERS)
+  INSTALL(
+      FILES
+      libev_io_opts.h
+      DESTINATION
+      include/libcouchbase)
+ENDIF(LCB_INSTALL_HEADERS)
 
 IF(NOT (HAVE_LIBEV3 OR HAVE_LIBEV4))
     RETURN()

data/ext/libcouchbase/plugins/io/libevent/CMakeLists.txt

@@ -1,8 +1,10 @@
-INSTALL(
-    FILES
-    libevent_io_opts.h
-    DESTINATION
-    include/libcouchbase)
+IF(LCB_INSTALL_HEADERS)
+  INSTALL(
+      FILES
+      libevent_io_opts.h
+      DESTINATION
+      include/libcouchbase)
+ENDIF(LCB_INSTALL_HEADERS)
 
 
 IF(NOT (HAVE_LIBEVENT OR HAVE_LIBEVENT2))

data/ext/libcouchbase/plugins/io/libuv/CMakeLists.txt

@@ -1,16 +1,18 @@
-INSTALL(
-    FILES
-    plugin-libuv.c
-    plugin-internal.h
-    libuv_compat.h
-    DESTINATION
-    include/libcouchbase/plugins/io/libuv)
+IF(LCB_INSTALL_HEADERS)
+  INSTALL(
+      FILES
+      plugin-libuv.c
+      plugin-internal.h
+      libuv_compat.h
+      DESTINATION
+      include/libcouchbase/plugins/io/libuv)
 
-INSTALL(
-    FILES
-    libuv_io_opts.h
-    DESTINATION
-    include/libcouchbase)
+  INSTALL(
+      FILES
+      libuv_io_opts.h
+      DESTINATION
+      include/libcouchbase)
+ENDIF(LCB_INSTALL_HEADERS)
 
 IF(NOT HAVE_LIBUV OR LCB_NO_PLUGINS OR NOT LCB_BUILD_LIBUV)
     RETURN()

data/ext/libcouchbase/plugins/io/libuv/libuv_compat.h

@@ -111,6 +111,9 @@
 #ifndef EAI_OVERFLOW
 #define EAI_OVERFLOW EAI_FAIL
 #endif
+#ifndef EFTYPE
+#define EFTYPE EAI_FAIL
+#endif
 
 #define OK 0
 

data/ext/libcouchbase/plugins/io/libuv/plugin-libuv.c

@@ -330,7 +330,6 @@ static int start_connect(lcb_io_opt_t iobase,
     my_uvreq_t *uvr;
     int ret;
     int err_is_set = 0;
-    uv_os_fd_t fd = INVALID_SOCKET;
 
     uvr = alloc_uvreq(sock, (generic_callback_t)callback);
     if (!uvr) {
@@ -366,12 +365,17 @@ static int start_connect(lcb_io_opt_t iobase,
         incref_sock(sock);
     }
 
-    /* Fetch socket descriptor for internal usage.
-     * For example to detect dead sockets. */
-    ret = uv_fileno((uv_handle_t *)&sock->tcp, &fd);
-    if (ret == 0) {
-        sock->base.socket = fd;
+#if UV_VERSION_HEX >= 0x010000
+    {
+        uv_os_fd_t fd = INVALID_SOCKET;
+        /* Fetch socket descriptor for internal usage.
+         * For example to detect dead sockets. */
+        ret = uv_fileno((uv_handle_t *)&sock->tcp, &fd);
+        if (ret == 0) {
+            sock->base.socket = fd;
+        }
     }
+#endif
 
     return ret;
 }
@@ -620,6 +624,7 @@ static void set_last_error(my_iops_t *io, int error)
     io->base.v.v1.error = uvc_last_errno(io->loop, error);
 }
 
+#if UV_VERSION_HEX >= 0x010000
 static int check_closed(lcb_io_opt_t io, lcb_sockdata_t *sockbase, int flags)
 {
     my_sockdata_t *sd = (my_sockdata_t *)sockbase;
@@ -661,6 +666,7 @@ GT_RETRY:
         }
     }
 }
+#endif
 
 static void wire_iops2(int version,
                        lcb_loop_procs *loop,
@@ -687,7 +693,9 @@ static void wire_iops2(int version,
     iocp->read2 = start_read;
     iocp->write2 = start_write2;
     iocp->cntl = cntl_socket;
+#if UV_VERSION_HEX >= 0x010000
     iocp->is_closed = check_closed;
+#endif
 
     /** Stuff we don't use */
     iocp->write = NULL;

data/ext/libcouchbase/plugins/io/select/CMakeLists.txt

@@ -4,8 +4,10 @@ SET_TARGET_PROPERTIES(couchbase_select
     PROPERTIES
         COMPILE_FLAGS "${CMAKE_C_FLAGS} ${LCB_CORE_CFLAGS}"
         POSITION_INDEPENDENT_CODE TRUE)
-INSTALL(
-    FILES
-        select_io_opts.h
-    DESTINATION
-        include/libcouchbase/)
+IF(LCB_INSTALL_HEADERS)
+  INSTALL(
+      FILES
+          select_io_opts.h
+      DESTINATION
+          include/libcouchbase/)
+ENDIF(LCB_INSTALL_HEADERS)

data/ext/libcouchbase/src/bootstrap.cc

@@ -53,7 +53,6 @@ void Bootstrap::config_callback(EventType event, ConfigInfo *info) {
 
     tm.cancel();
 
-    lcb_log(LOGARGS(instance, DEBUG), "Instance configured");
 
     if (info->get_origin() != CLCONFIG_FILE) {
         /* Set the timestamp for the current config to control throttling,
@@ -88,6 +87,7 @@ void Bootstrap::config_callback(EventType event, ConfigInfo *info) {
         state = S_BOOTSTRAPPED;
         lcb_aspend_del(&instance->pendops, LCB_PENDTYPE_COUNTER, NULL);
 
+        lcb_log(LOGARGS(instance, INFO), "Selected network configuration: \"%s\"", LCBT_SETTING(instance, network));
         if (instance->type == LCB_TYPE_BUCKET) {
             if (LCBVB_DISTTYPE(LCBT_VBCONFIG(instance)) == LCBVB_DIST_KETAMA &&
                 instance->cur_configinfo->get_origin() != CLCONFIG_MCRAW) {
@@ -212,6 +212,11 @@ lcb_error_t Bootstrap::bootstrap(unsigned options) {
     }
 
     if (options == BS_REFRESH_INITIAL) {
+        if (LCBT_SETTING(parent, network)) {
+            lcb_log(LOGARGS(parent, INFO), "Requested network configuration: \"%s\"", LCBT_SETTING(parent, network));
+        } else {
+            lcb_log(LOGARGS(parent, INFO), "Requested network configuration: heuristic");
+        }
         state = S_INITIAL_PRE;
         parent->confmon->prepare();
         tm.rearm(LCBT_SETTING(parent, config_timeout));

data/ext/libcouchbase/src/bucketconfig/bc_cccp.cc

@@ -186,7 +186,7 @@ CccpProvider::update(const char *host, const char *data)
     if (!vbc) {
         return LCB_CLIENT_ENOMEM;
     }
-    rv = lcbvb_load_json(vbc, data);
+    rv = lcbvb_load_json_ex(vbc, data, host, &LCBT_SETTING(this->parent, network));
 
     if (rv) {
         lcb_log(LOGARGS(this, ERROR), LOGFMT "Failed to parse config", LOGID(this));
@@ -313,17 +313,12 @@ CccpProvider::configure_nodes(const lcb::Hostlist& nodes_)
 void
 CccpProvider::config_updated(lcbvb_CONFIG *vbc)
 {
-    lcbvb_SVCMODE mode;
+    lcbvb_SVCMODE mode = LCBT_SETTING_SVCMODE(parent);
     if (LCBVB_NSERVERS(vbc) < 1) {
         return;
     }
 
     nodes->clear();
-    if (settings().sslopts & LCB_SSL_ENABLED) {
-        mode = LCBVB_SVCMODE_SSL;
-    } else {
-        mode = LCBVB_SVCMODE_PLAIN;
-    }
     for (size_t ii = 0; ii < LCBVB_NSERVERS(vbc); ii++) {
         const char *mcaddr = lcbvb_get_hostport(vbc,
             ii, LCBVB_SVCTYPE_DATA, mode);

data/ext/libcouchbase/src/bucketconfig/bc_file.cc

@@ -82,7 +82,7 @@ FileProvider::Status FileProvider::load_cache()
     }
 
     if (last_mtime == st.st_mtime) {
-        lcb_log(LOGARGS(this, WARN), LOGFMT "Modification time too old", LOGID(this));
+        lcb_log(LOGARGS(this, DEBUG), LOGFMT "Modification time too old", LOGID(this));
         return NO_CHANGES;
     }
 

data/ext/libcouchbase/src/bucketconfig/bc_http.cc

@@ -100,6 +100,7 @@ process_chunk(HttpProvider *http, const void *buf, unsigned nbuf)
     int rv;
     lcbvb_CONFIG *cfgh;
     unsigned state, oldstate, diff;
+    lcb_host_t *host;
     htp::Response& resp = http->htp->get_cur_response();
 
     oldstate = resp.state;
@@ -146,7 +147,6 @@ process_chunk(HttpProvider *http, const void *buf, unsigned nbuf)
 
     GT_CHECKDONE:
     if (http->try_nexturi) {
-        lcb_host_t *host;
         if (!(state & htp::Parser::S_DONE)) {
             return LCB_SUCCESS;
         }
@@ -177,7 +177,8 @@ process_chunk(HttpProvider *http, const void *buf, unsigned nbuf)
     if (!cfgh) {
         return LCB_CLIENT_ENOMEM;
     }
-    rv = lcbvb_load_json(cfgh, resp.body.c_str());
+    host = lcbio_get_host(lcbio_ctx_sock(http->ioctx));
+    rv = lcbvb_load_json_ex(cfgh, resp.body.c_str(), host->host, &LCBT_SETTING(http->parent, network));
     if (rv != 0) {
         lcb_log(LOGARGS(http, ERR), LOGFMT "Failed to parse a valid config from HTTP stream", LOGID(http));
         lcb_log_badconfig(LOGARGS(http, ERR), cfgh, resp.body.c_str());
@@ -413,17 +414,9 @@ ConfigInfo* HttpProvider::get_cached() {
 
 void HttpProvider::config_updated(lcbvb_CONFIG *newconfig)
 {
-    unsigned sopts;
-    lcbvb_SVCMODE mode;
+    lcbvb_SVCMODE mode = LCBT_SETTING_SVCMODE(parent);
     nodes->clear();
 
-    sopts = settings().sslopts;
-    if (sopts & LCB_SSL_ENABLED) {
-        mode = LCBVB_SVCMODE_SSL;
-    } else {
-        mode = LCBVB_SVCMODE_PLAIN;
-    }
-
     for (size_t ii = 0; ii < newconfig->nsrv; ++ii) {
         const char *ss;
         lcb_error_t status;

data/ext/libcouchbase/src/bucketconfig/clconfig.h

@@ -156,15 +156,16 @@ struct Confmon {
      * This function creates a new `confmon` object which can be used to manage
      * configurations and their providers.
      *
-     * @param settings
-     * @param iot
+     * @param settings pointer to LCB settings
+     * @param iot pointer socket IO routines
+     * @param instance LCB handle
      *
      * Once the confmon object has been created you may enable or disable various
      * providers (see lcb_confmon_set_provider_active()). Once no more providers
      * remain to be activated you should call lcb_confmon_prepare() once. Then
      * call the rest of the functions.
      */
-    Confmon(lcb_settings*, lcbio_pTABLE iot, lcb_t instance);
+    Confmon(lcb_settings* settings, lcbio_pTABLE iot, lcb_t instance);
     void destroy() { delete this; }
     ~Confmon();
 
@@ -186,7 +187,6 @@ struct Confmon {
      * Prepares the configuration monitor object for operations. This will insert
      * all the enabled providers into a list. Call this function each time a
      * provider has been enabled.
-     * @param mon
      */
     void prepare();
 
@@ -212,7 +212,6 @@ struct Confmon {
      *
      * This function is reentrant safe and may be called at any time.
      *
-     * @param mon
      * @see lcb_confmon_add_listener()
      * @see #stop()
      * @see #is_refreshing()
@@ -229,7 +228,6 @@ struct Confmon {
      * This function is safe to call anywhere. If the monitor is already stopped
      * then this function does nothing.
      *
-     * @param mon
      * @see #start()
      * @see #is_refreshing()
      */
@@ -237,7 +235,6 @@ struct Confmon {
 
     /**
      * @brief Check if the monitor is waiting for a new config from a provider
-     * @param mon
      * @return true if refreshing, false if idle
      */
     bool is_refreshing() const {
@@ -262,7 +259,6 @@ struct Confmon {
 
     /**
      * @brief Get the current monitor state
-     * @param mon the monitor
      * @return a set of flags consisting of @ref State values.
      */
     int get_state() const {
@@ -291,8 +287,8 @@ struct Confmon {
      * provider or enter the inactive state depending on the configuration and
      * whether the current provider is the last provider in the list.
      *
-     * @param provider
-     * @param err
+     * @param which reference to provider, which has been failed
+     * @param why error code
      */
     void provider_failed(Provider *which, lcb_error_t why);
 
@@ -312,13 +308,13 @@ struct Confmon {
      * This function should _not_ be called outside of an asynchronous provider's
      * handler.
      *
-     * @param provider the provider which yielded the new configuration
-     * @param info the new configuration
+     * @param which the provider which yielded the new configuration
+     * @param config the new configuration
      */
     void provider_got_config(Provider *which, ConfigInfo* config);
 
-    /** Dump information about the monitor
-     * @param mon the monitor object
+    /**
+     * Dump information about the monitor
      * @param fp the file to which information should be written
      */
     void dump(FILE *fp);
@@ -339,16 +335,14 @@ struct Confmon {
      * until remove_listener is called. Note that the listener is not allocated
      * by the confmon and its responsibility is the user's
      *
-     * @param mon the monitor
-     * @param listener the listener. The listener's contents are not copied into
+     * @param lsn the listener. The listener's contents are not copied into
      * confmon and should thus remain valid until it is removed
      */
     void add_listener(Listener* lsn);
 
     /**
      * @brief Unregister (and remove) a listener added via lcb_confmon_add_listener()
-     * @param mon the monitor
-     * @param listener the listener
+     * @param lsn the listener
      */
     void remove_listener(Listener *lsn);
 
@@ -423,8 +417,6 @@ struct Provider {
      * against a provider taking an excessively long time; therefore a provider
      * should implement a timeout mechanism of its choice to promptly deliver
      * a success or failure.
-     *
-     * @param pb
      */
     virtual lcb_error_t refresh() = 0;
 
@@ -436,7 +428,7 @@ struct Provider {
      * be needed again in quite some time. How long this "time" is can range
      * between 0 seconds and several minutes depending on how a user has
      * configured the client.
-     * @param pb
+     *
      * @return true if actually paused
      */
     virtual bool pause() {
@@ -446,17 +438,17 @@ struct Provider {
     /**
      * Called when a new configuration has been received.
      *
-     * @param provider the provider instance
      * @param config the current configuration.
      * Note that this should only update the server list and do nothing
      * else.
      */
-    virtual void config_updated(lcbvb_CONFIG*) {
+    virtual void config_updated(lcbvb_CONFIG* config) {
+        (void)config;
     }
 
     /**
      * Retrieve the list of nodes from this provider, if applicable
-     * @param p the provider
+     *
      * @return A list of nodes, or NULL if the provider does not have a list
      */
     virtual const lcb::Hostlist* get_nodes() const {
@@ -465,18 +457,20 @@ struct Provider {
 
     /**
      * Call to change the configured nodes of this provider.
-     * @param p The provider
+     *
      * @param l The list of nodes to apply
      */
-    virtual void configure_nodes(const lcb::Hostlist&) {
+    virtual void configure_nodes(const lcb::Hostlist& l) {
+        (void)l;
     }
 
     /**
      * Dump state information. This callback is optional
-     * @param p the provider
+     *
      * @param f the file to write to
      */
-    virtual void dump(FILE *) const {
+    virtual void dump(FILE *f) const {
+        (void)f;
     }
 
     void enable() {
@@ -515,7 +509,7 @@ public:
      * Creates a new configuration wrapper object containing the vbucket config
      * pointed to by 'config'. Its initial refcount will be set to 1.
      *
-     * @param config a newly parsed configuration
+     * @param vbc a newly parsed configuration
      * @param origin the type of provider from which the config originated.
      * @return a new ConfigInfo object. This should be incref()'d/decref()'d
      * as needed.
@@ -529,12 +523,12 @@ public:
      * This function returns an integer less than
      * zero, zero or greater than zero if the first argument is considered older
      * than, equal to, or later than the second argument.
-     * @param a
-     * @param b
+     *
+     * @param config anoother config
      * @see lcbvb_get_revision
      * @see ConfigInfo::cmpclock
      */
-    int compare(const ConfigInfo&);
+    int compare(const ConfigInfo& config);
 
     /**
      * @brief Increment the refcount on a config object
@@ -545,7 +539,6 @@ public:
      * @brief Decrement the refcount on a config object.
      * Decrement the refcount. If the internal refcount reaches 0 then the internal
      * members (including the vbucket config handle itself) will be freed.
-     * @param info the configuration
      */
     void decref() {
         if (!--refcount) {
@@ -621,7 +614,7 @@ bool file_set_filename(Provider *p, const char *f, bool ro);
 
 /**
  * Retrieve the filename for the provider
- * @param p The provider of type LCB_CLCONFIG_FILE
+ * @param p The provider of type CLCONFIG_FILE
  * @return the current filename being used.
  */
 const char* file_get_filename(Provider *p);
@@ -636,7 +629,7 @@ void file_set_readonly(Provider *p, bool val);
 /**
  * Get the socket representing the current REST connection to the cluster
  * (if applicable)
- * @param mon
+ * @param p The provider of type CLCONFIG_HTTP
  * @return
  */
 const lcbio_SOCKET* http_get_conn(const Provider *p);
@@ -647,7 +640,7 @@ static inline const lcbio_SOCKET* http_get_conn(Confmon *c) {
 
 /**
  * Get the hostname for the current REST connection to the cluster
- * @param mon
+ * @param p The provider of type CLCONFIG_HTTP
  * @return
  */
 const lcb_host_t * http_get_host(const Provider *p);