summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/byteorder.h2
-rw-r--r--source3/include/charset.h2
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/kanji.h2
-rw-r--r--source3/include/nameserv.h19
-rw-r--r--source3/include/proto.h8
-rw-r--r--source3/include/smb.h2
-rw-r--r--source3/include/trans2.h2
-rw-r--r--source3/include/version.h2
9 files changed, 29 insertions, 12 deletions
diff --git a/source3/include/byteorder.h b/source3/include/byteorder.h
index 51f368e61b..a55789a403 100644
--- a/source3/include/byteorder.h
+++ b/source3/include/byteorder.h
@@ -2,7 +2,7 @@
Unix SMB/Netbios implementation.
Version 1.9.
SMB Byte handling
- Copyright (C) Andrew Tridgell 1992-1995
+ Copyright (C) Andrew Tridgell 1992-1997
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
diff --git a/source3/include/charset.h b/source3/include/charset.h
index 72a8810e42..5f5e2016ee 100644
--- a/source3/include/charset.h
+++ b/source3/include/charset.h
@@ -2,7 +2,7 @@
Unix SMB/Netbios implementation.
Version 1.9.
Character set handling
- Copyright (C) Andrew Tridgell 1992-1995
+ Copyright (C) Andrew Tridgell 1992-1997
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
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 249e4940a9..e1ed3a5816 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -4,7 +4,7 @@
Unix SMB/Netbios implementation.
Version 1.9.
Machine customisation and include handling
- Copyright (C) Andrew Tridgell 1994-1995
+ Copyright (C) Andrew Tridgell 1994-1997
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
diff --git a/source3/include/kanji.h b/source3/include/kanji.h
index 6bc88b704d..ee3ba7e09a 100644
--- a/source3/include/kanji.h
+++ b/source3/include/kanji.h
@@ -2,7 +2,7 @@
Unix SMB/Netbios implementation.
Version 1.9.
Kanji Extensions
- Copyright (C) Andrew Tridgell 1992-1994
+ Copyright (C) Andrew Tridgell 1992-1997
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
diff --git a/source3/include/nameserv.h b/source3/include/nameserv.h
index 42bfe83dcc..12ddd033c8 100644
--- a/source3/include/nameserv.h
+++ b/source3/include/nameserv.h
@@ -2,7 +2,7 @@
Unix SMB/Netbios implementation.
Version 1.9.
NBT netbios header - version 2
- Copyright (C) Andrew Tridgell 1994-1995
+ Copyright (C) Andrew Tridgell 1994-1997
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
@@ -75,8 +75,6 @@
#define AM_BACKUP(work) (work->ServerType & SV_TYPE_BACKUP_BROWSER)
#define AM_DOMMST(work) (work->ServerType & SV_TYPE_DOMAIN_MASTER)
#define AM_DOMMEM(work) (work->ServerType & SV_TYPE_DOMAIN_MEMBER)
-#define AM_ANY_MASTER(work) (check_work_servertype(work->work_group, \
-SV_TYPE_MASTER_BROWSER|SV_TYPE_DOMAIN_MASTER))
/* microsoft browser NetBIOS name */
#define MSBROWSE "\001\002__MSBROWSE__\002"
@@ -160,6 +158,8 @@ struct name_record
time_t refresh_time; /* time record should be refreshed */
};
+struct subnet_record;
+
/* browse and backup server cache for synchronising browse list */
struct browse_cache_record
{
@@ -173,6 +173,7 @@ struct browse_cache_record
time_t sync_time;
BOOL synced;
BOOL local;
+ struct subnet_record *subnet;
};
/* this is used to hold the list of servers in my domain, and is */
@@ -413,3 +414,15 @@ struct packet_struct
SV_TYPE_PRINTQ_SERVER | SV_TYPE_SERVER_NT | \
SV_TYPE_NT )
+/* Macro's to enumerate subnets either with or without
+ the WINS subnet. */
+
+extern struct subnet_record *subnetlist;
+extern struct subnet_record *wins_subnet;
+
+#define FIRST_SUBNET subnetlist
+#define NEXT_SUBNET_EXCLUDING_WINS(x) ((x)->next)
+#define NEXT_SUBNET_INCLUDING_WINS(x) ( ((x) == wins_subnet) ? 0 : \
+ (((x)->next == 0) ? wins_subnet : \
+ (x)->next))
+
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 63f5622803..973b1a15f3 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -295,12 +295,14 @@ int reply_sendend(char *inbuf,char *outbuf);
/*The following definitions come from nameannounce.c */
+void reset_announce_timer();
void announce_request(struct work_record *work, struct in_addr ip);
void do_announce_request(char *info, char *to_name, int announce_type,
int from,
int to, struct in_addr dest_ip);
void sync_server(enum state_type state, char *serv_name, char *work_name,
int name_type,
+ struct subnet_record *d,
struct in_addr ip);
void do_announce_host(int command,
char *from_name, int from_type, struct in_addr from_ip,
@@ -318,7 +320,9 @@ void announce_remote(time_t t);
void expire_browse_cache(time_t t);
struct browse_cache_record *add_browser_entry(char *name, int type, char *wg,
- time_t ttl, struct in_addr ip, BOOL local);
+ time_t ttl,
+ struct subnet_record *d,
+ struct in_addr ip, BOOL local);
void do_browser_lists(time_t t);
/*The following definitions come from nameconf.c */
@@ -460,7 +464,7 @@ BOOL name_query(int fd,char *name,int name_type,
/*The following definitions come from nameresp.c */
void expire_netbios_response_entries(time_t t);
-struct response_record *queue_netbios_pkt_wins(struct subnet_record *d,
+struct response_record *queue_netbios_pkt_wins(
int fd,int quest_type,enum state_type state,
char *name,int name_type,int nb_flags, time_t ttl,
int server_type, char *my_name, char *my_comment,
diff --git a/source3/include/smb.h b/source3/include/smb.h
index fc9ac2048e..a6be0f16d5 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -2,7 +2,7 @@
Unix SMB/Netbios implementation.
Version 1.9.
SMB parameters and setup
- Copyright (C) Andrew Tridgell 1992-1995
+ Copyright (C) Andrew Tridgell 1992-1997
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
diff --git a/source3/include/trans2.h b/source3/include/trans2.h
index b99f1e6028..70285358bc 100644
--- a/source3/include/trans2.h
+++ b/source3/include/trans2.h
@@ -2,7 +2,7 @@
Unix SMB/Netbios implementation.
Version 1.9.
SMB transaction2 handling
- Copyright (C) Jeremy Allison 1994
+ Copyright (C) Jeremy Allison 1994-1997
Extensively modified by Andrew Tridgell, 1995
diff --git a/source3/include/version.h b/source3/include/version.h
index 1641109454..cc69bef521 100644
--- a/source3/include/version.h
+++ b/source3/include/version.h
@@ -1 +1 @@
-#define VERSION "1.9.16p12alpha"
+#define VERSION "1.9.17alpha1"
generated by cgit (git 2.34.1) at 2025-01-12 22:48:21 +0000