summaryrefslogtreecommitdiff
path: root/libcli
diff options
context:
space:
mode:
Diffstat (limited to 'libcli')
-rw-r--r--libcli/nbt/libnbt.h8
-rw-r--r--libcli/nbt/nbtsocket.c6
-rw-r--r--libcli/nbt/pynbt.c2
-rw-r--r--libcli/nbt/tools/nmblookup.c4
4 files changed, 10 insertions, 10 deletions
diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h
index 7d8ca49e9a..0c4420cd40 100644
--- a/libcli/nbt/libnbt.h
+++ b/libcli/nbt/libnbt.h
@@ -60,7 +60,7 @@ struct nbt_name_request {
bool received_wack;
/* the timeout event */
- struct timed_event *te;
+ struct tevent_timer *te;
/* the name transaction id */
uint16_t name_trn_id;
@@ -94,14 +94,14 @@ struct nbt_name_request {
*/
struct nbt_name_socket {
struct socket_context *sock;
- struct event_context *event_ctx;
+ struct tevent_context *event_ctx;
struct smb_iconv_convenience *iconv_convenience;
/* a queue of requests pending to be sent */
struct nbt_name_request *send_queue;
/* the fd event */
- struct fd_event *fde;
+ struct tevent_fd *fde;
/* mapping from name_trn_id to pending event */
struct idr_context *idr;
@@ -277,7 +277,7 @@ struct nbt_name_release {
};
struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx,
- struct event_context *event_ctx,
+ struct tevent_context *event_ctx,
struct smb_iconv_convenience *iconv_convenience);
struct nbt_name_request *nbt_name_query_send(struct nbt_name_socket *nbtsock,
struct nbt_name_query *io);
diff --git a/libcli/nbt/nbtsocket.c b/libcli/nbt/nbtsocket.c
index 65ed872533..780e2bbc82 100644
--- a/libcli/nbt/nbtsocket.c
+++ b/libcli/nbt/nbtsocket.c
@@ -114,7 +114,7 @@ failed:
/*
handle a request timeout
*/
-static void nbt_name_socket_timeout(struct event_context *ev, struct timed_event *te,
+static void nbt_name_socket_timeout(struct tevent_context *ev, struct tevent_timer *te,
struct timeval t, void *private)
{
struct nbt_name_request *req = talloc_get_type(private,
@@ -291,7 +291,7 @@ done:
/*
handle fd events on a nbt_name_socket
*/
-static void nbt_name_socket_handler(struct event_context *ev, struct fd_event *fde,
+static void nbt_name_socket_handler(struct tevent_context *ev, struct tevent_fd *fde,
uint16_t flags, void *private)
{
struct nbt_name_socket *nbtsock = talloc_get_type(private,
@@ -310,7 +310,7 @@ static void nbt_name_socket_handler(struct event_context *ev, struct fd_event *f
then operations will use that event context
*/
_PUBLIC_ struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx,
- struct event_context *event_ctx,
+ struct tevent_context *event_ctx,
struct smb_iconv_convenience *iconv_convenience)
{
struct nbt_name_socket *nbtsock;
diff --git a/libcli/nbt/pynbt.c b/libcli/nbt/pynbt.c
index 1d8924eac4..9afe7ea6c4 100644
--- a/libcli/nbt/pynbt.c
+++ b/libcli/nbt/pynbt.c
@@ -40,7 +40,7 @@ static void py_nbt_node_dealloc(PyObject *obj)
static PyObject *py_nbt_node_init(PyTypeObject *self, PyObject *args, PyObject *kwargs)
{
- struct event_context *ev;
+ struct tevent_context *ev;
nbt_node_Object *ret = PyObject_New(nbt_node_Object, &nbt_node_Type);
ret->mem_ctx = talloc_new(NULL);
diff --git a/libcli/nbt/tools/nmblookup.c b/libcli/nbt/tools/nmblookup.c
index 0d98cb99de..96023f64c3 100644
--- a/libcli/nbt/tools/nmblookup.c
+++ b/libcli/nbt/tools/nmblookup.c
@@ -181,7 +181,7 @@ static NTSTATUS do_node_query(struct nbt_name_socket *nbtsock,
}
-static bool process_one(struct loadparm_context *lp_ctx, struct event_context *ev,
+static bool process_one(struct loadparm_context *lp_ctx, struct tevent_context *ev,
struct interface *ifaces, const char *name, int nbt_port)
{
TALLOC_CTX *tmp_ctx = talloc_new(NULL);
@@ -272,7 +272,7 @@ int main(int argc, const char *argv[])
{
bool ret = true;
struct interface *ifaces;
- struct event_context *ev;
+ struct tevent_context *ev;
poptContext pc;
int opt;
enum {