X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=portmap%2Fportmap.x;h=abe31b986855c6253de1f744640e486bfa7be8e2;hb=8e003243fbec4cff4af3e9ca01ea713065336970;hp=17fd980455449cff57bde695be42296d1b28ff4e;hpb=55125e894af7d8db9f0c95524ac6edea8bcc8924;p=deb_libnfs.git

diff --git a/portmap/portmap.x b/portmap/portmap.x
index 17fd980..abe31b9 100644
--- a/portmap/portmap.x
+++ b/portmap/portmap.x
@@ -1,56 +1,127 @@
 /*
  * From RFC1833
+ * and http://tools.ietf.org/html/draft-ietf-oncrpc-rpcbind-00
  */
 
 const PMAP_PORT = 111;      /* portmapper port number */
 
-struct pmap_mapping {
+struct pmap2_mapping {
        unsigned int prog;
        unsigned int vers;
        unsigned int prot;
        unsigned int port;
 };
 
-struct pmap_call_args {
+struct pmap2_call_args {
        unsigned int prog;
        unsigned int vers;
        unsigned int proc;
        opaque args<>;
 };
 
-struct pmap_call_result {
+struct pmap2_call_result {
 	unsigned int port;
 	opaque res<>;
 };
 
-struct pmap_mapping_list {
-       pmap_mapping map;
-       pmap_mapping_list *next;
+struct pmap2_mapping_list {
+       pmap2_mapping map;
+       pmap2_mapping_list *next;
 };
 
-struct pmap_dump_result {
-       struct pmap_mapping_list *list;
+struct pmap2_dump_result {
+       struct pmap2_mapping_list *list;
+};
+
+struct pmap3_string_result {
+       string addr<>;
+};
+
+struct pmap3_mapping {
+       unsigned int prog;
+       unsigned int vers;
+       string netid<>;
+       string addr<>;
+       string owner<>;
+};
+
+struct pmap3_mapping_list {
+       pmap3_mapping map;
+       pmap3_mapping_list *next;
+};
+
+struct pmap3_dump_result {
+       struct pmap3_mapping_list *list;
+};
+
+struct pmap3_call_args {
+       unsigned int prog;
+       unsigned int vers;
+       unsigned int proc;
+       opaque args<>;
+};
+
+struct pmap3_call_result {
+	unsigned int port;
+	opaque res<>;
+};
+
+struct pmap3_netbuf {
+	unsigned int maxlen;
+	/* This pretty much contains a sockaddr_storage.
+	 * Beware differences in endianess for ss_family
+	 * and whether or not ss_len exists.
+	 */
+	opaque buf<>;
 };
 
 program PMAP_PROGRAM {
 	version PMAP_V2 {
         	void
-		PMAP_NULL(void)              = 0;
+		PMAP2_NULL(void)              = 0;
 
 		bool
-            	PMAP_SET(pmap_mapping)       = 1;
+            	PMAP2_SET(pmap2_mapping)       = 1;
 
             	bool
-            	PMAP_UNSET(pmap_mapping)     = 2;
+            	PMAP2_UNSET(pmap2_mapping)     = 2;
 
             	unsigned int
-            	PMAP_GETPORT(pmap_mapping)   = 3;
+            	PMAP2_GETPORT(pmap2_mapping)   = 3;
 
-		pmap_mapping_list
-		PMAP_DUMP(void)              = 4;
+		pmap2_dump_result
+		PMAP2_DUMP(void)               = 4;
 
-		pmap_call_result
-		PMAP_CALLIT(pmap_call_args)  = 5;
+		pmap2_call_result
+		PMAP2_CALLIT(pmap2_call_args)  = 5;
 	} = 2;
+	version PMAP_V3 {
+        	void
+		PMAP3_NULL(void)              = 0;
+
+		bool
+		PMAP3_SET(pmap3_mapping)      = 1;
+
+		bool
+		PMAP3_UNSET(pmap3_mapping)    = 2;
+
+		pmap3_string_result
+		PMAP3_GETADDR(pmap3_mapping)  = 3;
+
+		pmap3_dump_result
+		PMAP3_DUMP(void)              = 4;
+
+		pmap3_call_result
+		PMAP3_CALLIT(pmap3_call_args) = 5;
+
+		unsigned int
+		PMAP3_GETTIME(void)           = 6;
+
+		pmap3_netbuf
+		PMAP3_UADDR2TADDR(string)     = 7;
+
+		struct pmap3_string_result
+		PMAP3_TADDR2UADDR(pmap3_netbuf) = 8;
+	} = 3;
 } = 100000;