Simplify the upgrade path handling from PPA.

[deb_libnfs.git] / nsm / nsm.c

diff --git a/nsm/nsm.c b/nsm/nsm.c
index 591beb20c5b5956477f153b20ee42035ce45bac0..2a6f9ecfc28b161210bfb63b96ab6ff03f9288c7 100644 (file)
--- a/nsm/nsm.c
+++ b/nsm/nsm.c
@@ -46,25 +46,24 @@ int rpc_nsm1_null_async(struct rpc_context *rpc, rpc_cb cb, void *private_data)
        return 0;
 }
 
-#if 0
-int rpc_nlm4_test_async(struct rpc_context *rpc, rpc_cb cb, struct NLM4_TESTargs *args, void *private_data)
+int rpc_nsm1_stat_async(struct rpc_context *rpc, rpc_cb cb, struct NSM1_STATargs *args, void *private_data)
 {
        struct rpc_pdu *pdu;
 
-       pdu = rpc_allocate_pdu(rpc, NLM_PROGRAM, NLM_V4, NLM4_TEST, cb, private_data, (zdrproc_t)zdr_NLM4_TESTres, sizeof(NLM4_TESTres));
+       pdu = rpc_allocate_pdu(rpc, NSM_PROGRAM, NSM_V1, NSM1_STAT, cb, private_data, (zdrproc_t)zdr_NSM1_STATres, sizeof(NSM1_STATres));
        if (pdu == NULL) {
-               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nlm/test call");
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nsm/stat call");
                return -1;
        }
 
-       if (zdr_NLM4_TESTargs(&pdu->zdr, args) == 0) {
-               rpc_set_error(rpc, "ZDR error: Failed to encode NLM4_TESTargs");
+       if (zdr_NSM1_STATargs(&pdu->zdr, args) == 0) {
+               rpc_set_error(rpc, "ZDR error: Failed to encode NSM1_STATargs");
                rpc_free_pdu(rpc, pdu);
                return -2;
        }
 
        if (rpc_queue_pdu(rpc, pdu) != 0) {
-               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nlm/test call");
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nsm/stat call");
                rpc_free_pdu(rpc, pdu);
                return -1;
        }
@@ -72,24 +71,24 @@ int rpc_nlm4_test_async(struct rpc_context *rpc, rpc_cb cb, struct NLM4_TESTargs
        return 0;
 }
 
-int rpc_nlm4_lock_async(struct rpc_context *rpc, rpc_cb cb, struct NLM4_LOCKargs *args, void *private_data)
+int rpc_nsm1_mon_async(struct rpc_context *rpc, rpc_cb cb, struct NSM1_MONargs *args, void *private_data)
 {
        struct rpc_pdu *pdu;
 
-       pdu = rpc_allocate_pdu(rpc, NLM_PROGRAM, NLM_V4, NLM4_LOCK, cb, private_data, (zdrproc_t)zdr_NLM4_LOCKres, sizeof(NLM4_LOCKres));
+       pdu = rpc_allocate_pdu(rpc, NSM_PROGRAM, NSM_V1, NSM1_MON, cb, private_data, (zdrproc_t)zdr_NSM1_MONres, sizeof(NSM1_MONres));
        if (pdu == NULL) {
-               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nlm/lock call");
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nsm/mon call");
                return -1;
        }
 
-       if (zdr_NLM4_LOCKargs(&pdu->zdr, args) == 0) {
-               rpc_set_error(rpc, "ZDR error: Failed to encode NLM4_LOCKargs");
+       if (zdr_NSM1_MONargs(&pdu->zdr, args) == 0) {
+               rpc_set_error(rpc, "ZDR error: Failed to encode NSM1_MONargs");
                rpc_free_pdu(rpc, pdu);
                return -2;
        }
 
        if (rpc_queue_pdu(rpc, pdu) != 0) {
-               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nlm/lock call");
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nsm/mon call");
                rpc_free_pdu(rpc, pdu);
                return -1;
        }
@@ -97,24 +96,24 @@ int rpc_nlm4_lock_async(struct rpc_context *rpc, rpc_cb cb, struct NLM4_LOCKargs
        return 0;
 }
 
-int rpc_nlm4_cancel_async(struct rpc_context *rpc, rpc_cb cb, struct NLM4_CANCargs *args, void *private_data)
+int rpc_nsm1_unmon_async(struct rpc_context *rpc, rpc_cb cb, struct NSM1_UNMONargs *args, void *private_data)
 {
        struct rpc_pdu *pdu;
 
-       pdu = rpc_allocate_pdu(rpc, NLM_PROGRAM, NLM_V4, NLM4_CANCEL, cb, private_data, (zdrproc_t)zdr_NLM4_CANCres, sizeof(NLM4_CANCres));
+       pdu = rpc_allocate_pdu(rpc, NSM_PROGRAM, NSM_V1, NSM1_UNMON, cb, private_data, (zdrproc_t)zdr_NSM1_UNMONres, sizeof(NSM1_UNMONres));
        if (pdu == NULL) {
-               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nlm/cancel call");
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nsm/unmon call");
                return -1;
        }
 
-       if (zdr_NLM4_CANCargs(&pdu->zdr, args) == 0) {
-               rpc_set_error(rpc, "ZDR error: Failed to encode NLM4_CANCargs");
+       if (zdr_NSM1_UNMONargs(&pdu->zdr, args) == 0) {
+               rpc_set_error(rpc, "ZDR error: Failed to encode NSM1_UNMONargs");
                rpc_free_pdu(rpc, pdu);
                return -2;
        }
 
        if (rpc_queue_pdu(rpc, pdu) != 0) {
-               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nlm/cancel call");
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nsm/unmon call");
                rpc_free_pdu(rpc, pdu);
                return -1;
        }
@@ -122,31 +121,74 @@ int rpc_nlm4_cancel_async(struct rpc_context *rpc, rpc_cb cb, struct NLM4_CANCar
        return 0;
 }
 
-int rpc_nlm4_unlock_async(struct rpc_context *rpc, rpc_cb cb, struct NLM4_UNLOCKargs *args, void *private_data)
+int rpc_nsm1_unmonall_async(struct rpc_context *rpc, rpc_cb cb, struct NSM1_UNMONALLargs *args, void *private_data)
 {
        struct rpc_pdu *pdu;
 
-       pdu = rpc_allocate_pdu(rpc, NLM_PROGRAM, NLM_V4, NLM4_UNLOCK, cb, private_data, (zdrproc_t)zdr_NLM4_UNLOCKres, sizeof(NLM4_UNLOCKres));
+       pdu = rpc_allocate_pdu(rpc, NSM_PROGRAM, NSM_V1, NSM1_UNMON_ALL, cb, private_data, (zdrproc_t)zdr_NSM1_UNMONALLres, sizeof(NSM1_UNMONALLres));
        if (pdu == NULL) {
-               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nlm/unlock call");
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nsm/unmonall call");
                return -1;
        }
 
-       if (zdr_NLM4_UNLOCKargs(&pdu->zdr, args) == 0) {
-               rpc_set_error(rpc, "ZDR error: Failed to encode NLM4_UNLOCKargs");
+       if (zdr_NSM1_UNMONALLargs(&pdu->zdr, args) == 0) {
+               rpc_set_error(rpc, "ZDR error: Failed to encode NSM1_UNMONALLargs");
                rpc_free_pdu(rpc, pdu);
                return -2;
        }
 
        if (rpc_queue_pdu(rpc, pdu) != 0) {
-               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nlm/unlock call");
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nsm/unmonall call");
+               rpc_free_pdu(rpc, pdu);
+               return -1;
+       }
+
+       return 0;
+}
+
+int rpc_nsm1_simucrash_async(struct rpc_context *rpc, rpc_cb cb, void *private_data)
+{
+       struct rpc_pdu *pdu;
+
+       pdu = rpc_allocate_pdu(rpc, NSM_PROGRAM, NSM_V1, NSM1_SIMU_CRASH, cb, private_data, (zdrproc_t)zdr_void, 0);
+       if (pdu == NULL) {
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nsm/simucrash call");
+               return -1;
+       }
+
+       if (rpc_queue_pdu(rpc, pdu) != 0) {
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nsm/simucrash call");
+               rpc_free_pdu(rpc, pdu);
+               return -1;
+       }
+
+       return 0;
+}
+
+int rpc_nsm1_notify_async(struct rpc_context *rpc, rpc_cb cb, struct NSM1_NOTIFYargs *args, void *private_data)
+{
+       struct rpc_pdu *pdu;
+
+       pdu = rpc_allocate_pdu(rpc, NSM_PROGRAM, NSM_V1, NSM1_NOTIFY, cb, private_data, (zdrproc_t)zdr_void, 0);
+       if (pdu == NULL) {
+               rpc_set_error(rpc, "Out of memory. Failed to allocate pdu for nsm/notify call");
+               return -1;
+       }
+
+       if (zdr_NSM1_NOTIFYargs(&pdu->zdr, args) == 0) {
+               rpc_set_error(rpc, "ZDR error: Failed to encode NSM1_NOTIFYargs");
+               rpc_free_pdu(rpc, pdu);
+               return -2;
+       }
+
+       if (rpc_queue_pdu(rpc, pdu) != 0) {
+               rpc_set_error(rpc, "Out of memory. Failed to queue pdu for nsm/notify call");
                rpc_free_pdu(rpc, pdu);
                return -1;
        }
 
        return 0;
 }
-#endif
 
 char *nsmstat1_to_str(int st)
 {