diff --git a/mediachanger/castorrmc/h/rmc_procreq.h b/mediachanger/castorrmc/h/rmc_procreq.h index 123e66611bfabd652abb57bab601211b768e68be..05ff1d6a9bcf30544a37ac623f5315ab3e4f5ea6 100644 --- a/mediachanger/castorrmc/h/rmc_procreq.h +++ b/mediachanger/castorrmc/h/rmc_procreq.h @@ -26,13 +26,13 @@ #ifndef _RMC_PROCREQ_H #define _RMC_PROCREQ_H 1 -int rmc_srv_export(const int rpfd, char *const req_data, const char *const clienthost); -int rmc_srv_findcart(const int rpfd, char *const req_data, const char *const clienthost); -int rmc_srv_getgeom(const int rpfd, char *const req_data, const char *const clienthost); -int rmc_srv_import(const int rpfd, char *const req_data, const char *const clienthost); -int rmc_srv_mount( const int rpfd, char *const req_data, const char *const clienthost); -int rmc_srv_readelem(const int rpfd, char *const req_data, const char *const clienthost); -int rmc_srv_unmount(const int rpfd, char *const req_data, const char *const clienthost); -int rmc_srv_genericmount(const int rpfd, char *const req_data, const char *const clienthost); -int rmc_srv_genericunmount(const int rpfd, char *const req_data, const char *const clienthost); +int rmc_srv_export(const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost); +int rmc_srv_findcart(const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost); +int rmc_srv_getgeom(const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost); +int rmc_srv_import(const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost); +int rmc_srv_mount(const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost); +int rmc_srv_readelem(const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost); +int rmc_srv_unmount(const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost); +int rmc_srv_genericmount(const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost); +int rmc_srv_genericunmount(const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost); #endif diff --git a/mediachanger/castorrmc/rmc/rmc_procreq.c b/mediachanger/castorrmc/rmc/rmc_procreq.c index 80bf2d42bbbabb67d7ec51e2aed38aa5006fdbe0..45e25b6520512adba2cce21f18ad9527afb4029c 100644 --- a/mediachanger/castorrmc/rmc/rmc_procreq.c +++ b/mediachanger/castorrmc/rmc/rmc_procreq.c @@ -27,11 +27,11 @@ #include <string.h> #include <Ctape_api.h> extern struct extended_robot_info extended_robot_info; -extern char localhost[CA_MAXHOSTNAMELEN+1]; /* rmc_srv_export - export/eject a cartridge from the robot */ int rmc_srv_export( + const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost) @@ -87,6 +87,7 @@ int rmc_srv_export( /* rmc_srv_findcart - find cartridge(s) */ int rmc_srv_findcart( + const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost) @@ -186,6 +187,7 @@ int rmc_srv_findcart( /* rmc_srv_getgeom - get the robot geometry */ int rmc_srv_getgeom( + const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost) @@ -239,6 +241,7 @@ int rmc_srv_getgeom( /* rmc_srv_import - import/inject a cartridge into the robot */ int rmc_srv_import( + const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost) @@ -294,6 +297,7 @@ int rmc_srv_import( /* rmc_srv_mount - mount a cartridge on a drive */ int rmc_srv_mount( + const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost) @@ -354,6 +358,7 @@ int rmc_srv_mount( /* rmc_srv_readelem - read element status */ int rmc_srv_readelem( + const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost) @@ -446,6 +451,7 @@ int rmc_srv_readelem( /* rmc_srv_unmount - dismount a cartridge from a drive */ int rmc_srv_unmount( + const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost) @@ -504,6 +510,7 @@ int rmc_srv_unmount( } int rmc_srv_genericmount( + const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost) @@ -512,6 +519,7 @@ int rmc_srv_genericmount( } int rmc_srv_genericunmount( + const char *const localhost, const int rpfd, char *const req_data, const char *const clienthost) diff --git a/mediachanger/castorrmc/rmc/rmc_serv.c b/mediachanger/castorrmc/rmc/rmc_serv.c index 9be188f1cbc53ffd98300ba7c73c88abb2facb9a..ab06ae25f46ac6a3138169802acdea4bca2a6879 100644 --- a/mediachanger/castorrmc/rmc/rmc_serv.c +++ b/mediachanger/castorrmc/rmc/rmc_serv.c @@ -362,32 +362,34 @@ static void procreq( switch (req_type) { case RMC_MOUNT: - c = rmc_srv_mount (rpfd, req_data, clienthost); + c = rmc_srv_mount (localhost, rpfd, req_data, clienthost); break; case RMC_UNMOUNT: - c = rmc_srv_unmount (rpfd, req_data, clienthost); + c = rmc_srv_unmount (localhost, rpfd, req_data, clienthost); break; case RMC_EXPORT: - c = rmc_srv_export (rpfd, req_data, clienthost); + c = rmc_srv_export (localhost, rpfd, req_data, clienthost); break; case RMC_IMPORT: - c = rmc_srv_import (rpfd, req_data, clienthost); + c = rmc_srv_import (localhost, rpfd, req_data, clienthost); break; case RMC_GETGEOM: - c = rmc_srv_getgeom (rpfd, req_data, clienthost); + c = rmc_srv_getgeom (localhost, rpfd, req_data, clienthost); break; case RMC_READELEM: - c = rmc_srv_readelem (rpfd, req_data, clienthost); + c = rmc_srv_readelem (localhost, rpfd, req_data, clienthost); break; case RMC_FINDCART: - c = rmc_srv_findcart (rpfd, req_data, clienthost); + c = rmc_srv_findcart (localhost, rpfd, req_data, clienthost); break; +/* case RMC_GENERICMOUNT: - c = rmc_srv_genericmount (rpfd, req_data, clienthost); + c = rmc_srv_genericmount (localhost, rpfd, req_data, clienthost); break; case RMC_GENERICUNMOUNT: - c = rmc_srv_genericunmount (rpfd, req_data, clienthost); + c = rmc_srv_genericunmount (localhost, rpfd, req_data, clienthost); break; +*/ default: rmc_sendrep (rpfd, MSG_ERR, RMC03, req_type); c = ERMCUNREC;