socket: fix broken connect for non broadcast traffic

[deb_libnfs.git] / nlm / nlm.x

diff --git a/nlm/nlm.x b/nlm/nlm.x
index 9d728d3e1e3846d82e766f854ecb601f1e2bd094..8ec6614ddb8ac714d8580b2235d1b7a0175504fc 100644 (file)
--- a/nlm/nlm.x
+++ b/nlm/nlm.x
@@ -1,5 +1,6 @@
 /* based on rfc1813 and wireshark */
 
+typedef unsigned hyper uint64;
 
 struct nlm_fh4 {
        opaque       data<>;
@@ -28,8 +29,8 @@ struct nlm4_holder {
        bool           exclusive;
        unsigned int   svid;
        nlm4_oh        oh;
-       unsigned hyper l_offset;
-       unsigned hyper l_len;
+       uint64         l_offset;
+       uint64         l_len;
 };
 
 const NLM_MAXNAME = 256;
@@ -38,8 +39,8 @@ struct nlm4_lock {
        struct nlm_fh4 fh;
        nlm4_oh        oh;
        unsigned int   svid;
-       unsigned hyper l_offset;
-       unsigned hyper l_len;
+       uint64         l_offset;
+       uint64         l_len;
 };
 
 struct nlm4_share {
@@ -108,6 +109,17 @@ struct NLM4_LOCKargs {
        int state;
 };
 
+struct NLM4_GRANTEDargs {
+       nlm_cookie cookie;
+       bool       exclusive;
+       nlm4_lock  lock;
+};
+
+struct NLM4_GRANTEDres {
+       nlm_cookie cookie;
+       nlmstat4 status;
+};
+
 program NLM_PROGRAM {
        version NLM_V4 {
                void
@@ -125,8 +137,8 @@ program NLM_PROGRAM {
                NLM4_UNLOCKres
                NLM4_UNLOCK(NLM4_UNLOCKargs)     = 4;
 
-/*             nlm4_res                         */
-/*             NLM4_GRANTED(nlm4_testargs)      = 5;   */
+               NLM4_GRANTEDres
+               NLM4_GRANT(NLM4_GRANTEDargs)      = 5;
 
                void
                NLM4_TEST_MSG(NLM4_TESTargs)     = 6;
@@ -140,8 +152,8 @@ program NLM_PROGRAM {
                void
                NLM4_UNLOCK_MSG(NLM4_UNLOCKargs) = 9;
 
-/*             void                             */
-/*             NLM4_GRANTED_MSG(nlm4_testargs) = 10;   */
+               void
+               NLM4_GRANT_MSG(NLM4_GRANTEDargs) = 10;
 
                void
                NLM4_TEST_RES(NLM4_TESTres)     = 11;
@@ -155,8 +167,8 @@ program NLM_PROGRAM {
                void
                NLM4_UNLOCK_RES(NLM4_UNLOCKres)       = 14;
 
-/*             void                            */
-/*             NLM4_GRANTED_RES(nlm4_res)      = 15;   */
+               void
+               NLM4_GRANT_RES(NLM4_GRANTEDres)      = 15;
 
 /*             nlm4_shareres                   */
 /*             NLM4_SHARE(nlm4_shareargs)      = 20;   */