Changeset 988 for vendor/current/libcli/nbt/nbtsocket.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/libcli/nbt/nbtsocket.c (modified) (13 diffs)

vendor/current/libcli/nbt/nbtsocket.c

@@ -51 +51 @@
         }
         if (req->nbtsock->send_queue == NULL) {
-                EVENT_FD_NOT_WRITEABLE(req->nbtsock->fde);
+                TEVENT_FD_NOT_WRITEABLE(req->nbtsock->fde);
         }
         if (req->nbtsock->num_pending == 0 &&
             req->nbtsock->incoming.handler == NULL) {
-                EVENT_FD_NOT_READABLE(req->nbtsock->fde);
+                TEVENT_FD_NOT_READABLE(req->nbtsock->fde);
         }
         return 0;
@@ -88 +88 @@
                         talloc_free(req);
                 } else {
-                        EVENT_FD_READABLE(nbtsock->fde);
+                        TEVENT_FD_READABLE(nbtsock->fde);
                         nbtsock->num_pending++;
                 }
         }
 
-        EVENT_FD_NOT_WRITEABLE(nbtsock->fde);
+        TEVENT_FD_NOT_WRITEABLE(nbtsock->fde);
         talloc_free(tmp_ctx);
         return;
@@ -123 +123 @@
         if (req->num_retries != 0) {
                 req->num_retries--;
-                req->te = event_add_timed(req->nbtsock->event_ctx, req,
-                                          timeval_add(&t, req->timeout, 0),
-                                          nbt_name_socket_timeout, req);
+                req->te = tevent_add_timer(req->nbtsock->event_ctx, req,
+                                           timeval_add(&t, req->timeout, 0),
+                                           nbt_name_socket_timeout, req);
                 if (req->state != NBT_REQUEST_SEND) {
                         req->state = NBT_REQUEST_SEND;
-                        DLIST_ADD_END(req->nbtsock->send_queue, req,
-                                      struct nbt_name_request *);
-                }
-                EVENT_FD_WRITEABLE(req->nbtsock->fde);
+                        DLIST_ADD_END(req->nbtsock->send_queue, req);
+                }
+                TEVENT_FD_WRITEABLE(req->nbtsock->fde);
                 return;
         }
@@ -274 +273 @@
                 }
                 req->timeout = ttl;
-                req->te = event_add_timed(req->nbtsock->event_ctx, req,
-                                          timeval_current_ofs(req->timeout, 0),
-                                          nbt_name_socket_timeout, req);
+                req->te = tevent_add_timer(req->nbtsock->event_ctx, req,
+                                           timeval_current_ofs(req->timeout, 0),
+                                           nbt_name_socket_timeout, req);
                 return;
         }
@@ -319 +318 @@
         struct nbt_name_socket *nbtsock = talloc_get_type(private_data,
                                                           struct nbt_name_socket);
-        if (flags & EVENT_FD_WRITE) {
+        if (flags & TEVENT_FD_WRITE) {
                 nbt_name_socket_send(nbtsock);
         }
-        if (flags & EVENT_FD_READ) {
+        if (flags & TEVENT_FD_READ) {
                 nbt_name_socket_recv(nbtsock);
         }
@@ -359 +358 @@
         nbtsock->unexpected.handler = NULL;
 
-        nbtsock->fde = event_add_fd(nbtsock->event_ctx, nbtsock,
-                                    socket_get_fd(nbtsock->sock), 0,
-                                    nbt_name_socket_handler, nbtsock);
+        nbtsock->fde = tevent_add_fd(nbtsock->event_ctx, nbtsock,
+                                     socket_get_fd(nbtsock->sock), 0,
+                                     nbt_name_socket_handler, nbtsock);
 
         return nbtsock;
@@ -408 +407 @@
         req->name_trn_id     = id;
 
-        req->te = event_add_timed(nbtsock->event_ctx, req,
-                                  timeval_current_ofs(req->timeout, 0),
-                                  nbt_name_socket_timeout, req);
+        req->te = tevent_add_timer(nbtsock->event_ctx, req,
+                                   timeval_current_ofs(req->timeout, 0),
+                                   nbt_name_socket_timeout, req);
 
         talloc_set_destructor(req, nbt_name_request_destructor);
@@ -419 +418 @@
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) goto failed;
 
-        DLIST_ADD_END(nbtsock->send_queue, req, struct nbt_name_request *);
+        DLIST_ADD_END(nbtsock->send_queue, req);
 
         if (DEBUGLVL(10)) {
@@ -427 +426 @@
         }
 
-        EVENT_FD_WRITEABLE(nbtsock->fde);
+        TEVENT_FD_WRITEABLE(nbtsock->fde);
 
         return req;
@@ -470 +469 @@
         }
 
-        DLIST_ADD_END(nbtsock->send_queue, req, struct nbt_name_request *);
-
-        EVENT_FD_WRITEABLE(nbtsock->fde);
+        DLIST_ADD_END(nbtsock->send_queue, req);
+
+        TEVENT_FD_WRITEABLE(nbtsock->fde);
 
         return NT_STATUS_OK;
@@ -489 +488 @@
 
         while (req->state < NBT_REQUEST_DONE) {
-                if (event_loop_once(req->nbtsock->event_ctx) != 0) {
+                if (tevent_loop_once(req->nbtsock->event_ctx) != 0) {
                         req->state = NBT_REQUEST_ERROR;
                         req->status = NT_STATUS_UNEXPECTED_NETWORK_ERROR;
@@ -509 +508 @@
         nbtsock->incoming.handler = handler;
         nbtsock->incoming.private_data = private_data;
-        EVENT_FD_READABLE(nbtsock->fde);
+        TEVENT_FD_READABLE(nbtsock->fde);
         return NT_STATUS_OK;
 }
@@ -523 +522 @@
         nbtsock->unexpected.handler = handler;
         nbtsock->unexpected.private_data = private_data;
-        EVENT_FD_READABLE(nbtsock->fde);
+        TEVENT_FD_READABLE(nbtsock->fde);
         return NT_STATUS_OK;
 }