Changeset 183 for trunk/src/emx/include/netnb

Timestamp:

May 19, 2003, 4:41:00 AM (22 years ago)

Author:

bird

Message:

#434: Initial tcpip header merges.

File:

• trunk/src/emx/include/netnb/nb.h (modified) (3 diffs, 1 prop)

trunk/src/emx/include/netnb/nb.h

@@ -12 +12 @@
 
 #define NBPROTO_NB      1
-#define NB_FAMILY       AF_NETBIOS
+#define NB_FAMILY       18 /* temporary hack? */
 #define NB_ADDRSIZE     sizeof(struct sockaddr_nb)
 #define NB_UNIQUE       0
@@ -20 +20 @@
 #define NB_NETIDLEN     8
 #define NB_HOSTLEN      12
-#define NB_PORTLEN      4
+#define NB_PORTLEN      (NB_NAMELEN - NB_HOSTLEN)
 /*                       1234567890123456 */
 #define NB_BCAST_NAME   "*               "
@@ -26 +26 @@
 #define NB_NULL_NAME    "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
 
-#define NBPORT_RESERVED IPPORT_RESERVED
-#define NBPORT_USERRESERVED IPPORT_USERRESERVED
+/* must match IOPORT_* constants in netinet/in.h! */
+#ifdef TCPV40HDRS
+#define NBPORT_RESERVED         "1024"
+#define NBPORT_USERRESERVED     "5000"
+#else
+#define NBPORT_RESERVED         "49152"
+#define NBPORT_USERRESERVED     "65535"
+#endif
 
 /* address format for netbios */
+#pragma pack(1)
 struct sockaddr_nb {
+#ifdef TCPV40HDRS
         short   snb_family;             /* protocol family */
+#else
+        u_char  snb_len;
+        u_char  snb_family;             /* netbios protocol family */
+#endif
         short   snb_type;               /* unique/multicast */
         char    snb_netid[NB_NETIDLEN]; /* netid */
         char    snb_name[NB_NAMELEN];   /* name */
 };
+#pragma pack()
 
 #endif /* !_NETNB_NB_H_ */