Changeset 740 for vendor/current/source3/lib/messages.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/lib/messages.c (modified) (9 diffs)

vendor/current/source3/lib/messages.c ¶

@@ -47 +47 @@
 
 #include "includes.h"
-#include "librpc/gen_ndr/messaging.h"
-#include "librpc/gen_ndr/ndr_messaging.h"
+#include "dbwrap.h"
+#include "serverid.h"
+#include "messages.h"
 
 struct messaging_callback {
@@ -96 +97 @@
 ****************************************************************************/
 
-static int traverse_fn(struct db_record *rec,
-                       const struct connections_key *ckey,
-                       const struct connections_data *crec,
-                       void *state)
+static int traverse_fn(struct db_record *rec, const struct server_id *id,
+                       uint32_t msg_flags, void *state)
 {
         struct msg_all *msg_all = (struct msg_all *)state;
         NTSTATUS status;
 
-        if (crec->cnum != -1)
+        /* Don't send if the receiver hasn't registered an interest. */
+
+        if((msg_flags & msg_all->msg_flag) == 0) {
                 return 0;
-
-        /* Don't send if the receiver hasn't registered an interest. */
-
-        if(!(crec->bcast_msg_flags & msg_all->msg_flag))
-                return 0;
+        }
 
         /* If the msg send fails because the pid was not found (i.e. smbd died), 
          * the msg has already been deleted from the messages.tdb.*/
 
-        status = messaging_send_buf(msg_all->msg_ctx,
-                                    crec->pid, msg_all->msg_type,
+        status = messaging_send_buf(msg_all->msg_ctx, *id, msg_all->msg_type,
                                     (uint8 *)msg_all->buf, msg_all->len);
 
@@ -123 +119 @@
                 /* If the pid was not found delete the entry from connections.tdb */
 
-                DEBUG(2,("pid %s doesn't exist - deleting connections %d [%s]\n",
-                         procid_str_static(&crec->pid), crec->cnum,
-                         crec->servicename));
+                DEBUG(2, ("pid %s doesn't exist\n", procid_str_static(id)));
 
                 rec->delete_rec(rec);
@@ -173 +167 @@
         msg_all.msg_ctx = msg_ctx;
 
-        connections_forall(traverse_fn, &msg_all);
+        serverid_traverse(traverse_fn, &msg_all);
         if (n_sent)
                 *n_sent = msg_all.n_sent;
@@ -201 +195 @@
 
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(0, ("messaging_tdb_init failed: %s\n",
+                DEBUG(2, ("messaging_tdb_init failed: %s\n",
                           nt_errstr(status)));
                 TALLOC_FREE(ctx);
@@ -212 +206 @@
 
                 if (!NT_STATUS_IS_OK(status)) {
-                        DEBUG(1, ("messaging_ctdb_init failed: %s\n",
+                        DEBUG(2, ("messaging_ctdb_init failed: %s\n",
                                   nt_errstr(status)));
                         TALLOC_FREE(ctx);
@@ -218 +212 @@
                 }
         }
+        ctx->id.vnn = get_my_vnn();
 #endif
 
@@ -231 +226 @@
 }
 
+struct server_id messaging_server_id(const struct messaging_context *msg_ctx)
+{
+        return msg_ctx->id;
+}
+
 /*
  * re-init after a fork
  */
-NTSTATUS messaging_reinit(struct messaging_context *msg_ctx)
+NTSTATUS messaging_reinit(struct messaging_context *msg_ctx,
+                          struct server_id id)
 {
         NTSTATUS status;
 
         TALLOC_FREE(msg_ctx->local);
+
+        msg_ctx->id = id;
 
         status = messaging_tdb_init(msg_ctx, msg_ctx, &msg_ctx->local);
@@ -361 +364 @@
 
 /*
-  Dispatch one messsaging_rec
+  Dispatch one messaging_rec
 */
 void messaging_dispatch_rec(struct messaging_context *msg_ctx,