libsmb: Give unexpected.c its own header
authorVolker Lendecke <vl@samba.org>
Mon, 15 Jan 2018 15:12:15 +0000 (16:12 +0100)
committerJeremy Allison <jra@samba.org>
Tue, 23 Jan 2018 00:49:22 +0000 (01:49 +0100)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/libsmb/clidgram.c
source3/libsmb/namequery.c
source3/libsmb/nmblib.h
source3/libsmb/unexpected.c
source3/libsmb/unexpected.h [new file with mode: 0644]
source3/nmbd/nmbd_packets.c

index d8fa1c6..8f0dba3 100644 (file)
@@ -24,6 +24,7 @@
 #include "../lib/util/tevent_ntstatus.h"
 #include "libsmb/clidgram.h"
 #include "libsmb/nmblib.h"
+#include "libsmb/unexpected.h"
 #include "messages.h"
 #include "librpc/gen_ndr/samr.h"
 #include "../lib/util/pidfile.h"
index 4b41546..6107e8f 100644 (file)
@@ -26,6 +26,7 @@
 #include "lib/async_req/async_sock.h"
 #include "lib/tsocket/tsocket.h"
 #include "libsmb/nmblib.h"
+#include "libsmb/unexpected.h"
 #include "../libcli/nbt/libnbt.h"
 #include "libads/kerberos_proto.h"
 
index d8290dc..7e1e40c 100644 (file)
 
 #include "nameserv.h"
 
-struct nb_packet_server;
-struct nb_packet_reader;
-
-NTSTATUS nb_packet_server_create(TALLOC_CTX *mem_ctx,
-                                struct tevent_context *ev,
-                                int max_clients,
-                                struct nb_packet_server **presult);
-void nb_packet_dispatch(struct nb_packet_server *server,
-                       struct packet_struct *p);
-struct tevent_req *nb_packet_reader_send(TALLOC_CTX *mem_ctx,
-                                        struct tevent_context *ev,
-                                        enum packet_type type,
-                                        int trn_id,
-                                        const char *mailslot_name);
-NTSTATUS nb_packet_reader_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
-                              struct nb_packet_reader **preader);
-struct tevent_req *nb_packet_read_send(TALLOC_CTX *mem_ctx,
-                                      struct tevent_context *ev,
-                                      struct nb_packet_reader *reader);
-NTSTATUS nb_packet_read_recv(struct tevent_req *req,
-                            struct packet_struct **ppacket);
-
 /* The following definitions come from libsmb/nmblib.c  */
 
 void debug_nmb_packet(struct packet_struct *p);
index dd9ff7a..96de144 100644 (file)
 */
 
 #include "includes.h"
+#include "libsmb/unexpected.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "lib/util_tsock.h"
-#include "lib/tsocket/tsocket.h"
 #include "libsmb/nmblib.h"
+#include "lib/tsocket/tsocket.h"
 #include "lib/util/sys_rw.h"
 
 static const char *nmbd_socket_dir(void)
diff --git a/source3/libsmb/unexpected.h b/source3/libsmb/unexpected.h
new file mode 100644 (file)
index 0000000..a40a507
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Copyright (C) Volker Lendecke 2018
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LIBSMB_UNEXPECTED_H__
+#define __LIBSMB_UNEXPECTED_H__
+
+#include "replace.h"
+#include <tevent.h>
+#include "libcli/util/ntstatus.h"
+#include "nameserv.h"
+
+struct nb_packet_server;
+struct nb_packet_reader;
+
+NTSTATUS nb_packet_server_create(TALLOC_CTX *mem_ctx,
+                                struct tevent_context *ev,
+                                int max_clients,
+                                struct nb_packet_server **presult);
+void nb_packet_dispatch(struct nb_packet_server *server,
+                       struct packet_struct *p);
+struct tevent_req *nb_packet_reader_send(TALLOC_CTX *mem_ctx,
+                                        struct tevent_context *ev,
+                                        enum packet_type type,
+                                        int trn_id,
+                                        const char *mailslot_name);
+NTSTATUS nb_packet_reader_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                              struct nb_packet_reader **preader);
+struct tevent_req *nb_packet_read_send(TALLOC_CTX *mem_ctx,
+                                      struct tevent_context *ev,
+                                      struct nb_packet_reader *reader);
+NTSTATUS nb_packet_read_recv(struct tevent_req *req,
+                            struct packet_struct **ppacket);
+
+#endif
index de5ae1e..2b7cc82 100644 (file)
@@ -24,6 +24,7 @@
 #include "../lib/util/select.h"
 #include "system/select.h"
 #include "libsmb/libsmb.h"
+#include "libsmb/unexpected.h"
 
 extern int ClientNMB;
 extern int ClientDGRAM;