Date: Fri, 13 Jul 2012 07:18:10 +0000 From: vchan@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r239333 - soc2012/vchan/gtcp/bwalex-tc-play Message-ID: <20120713071810.111D01065672@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vchan Date: Fri Jul 13 07:18:09 2012 New Revision: 239333 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239333 Log: map_name function no longer needed in main.c Modified: soc2012/vchan/gtcp/bwalex-tc-play/main.c soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c soc2012/vchan/gtcp/bwalex-tc-play/tcplay.h Modified: soc2012/vchan/gtcp/bwalex-tc-play/main.c ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/main.c Fri Jul 13 06:46:09 2012 (r239332) +++ soc2012/vchan/gtcp/bwalex-tc-play/main.c Fri Jul 13 07:18:09 2012 (r239333) @@ -218,9 +218,10 @@ keyfiles[nkeyfiles++] = optarg; break; case 'm': - map_vol = 1; - map_name = optarg; - break; + //map_vol = 1; + //map_name = optarg; + fprintf(stderr, "--map no longer needed.\n--create now does the mapping.\n"); + break; case 's': sflag = 1; sys_dev = optarg; @@ -283,7 +284,7 @@ if (create_vol) { g_gate_load_module(); g_gate_open_device(); - error = create_volume(map_name, dev, contain_hidden, keyfiles, nkeyfiles, + error = create_volume(map_name, dev, sflag, sys_dev, protect_hidden, contain_hidden, keyfiles, nkeyfiles, h_keyfiles, n_hkeyfiles, prf, cipher_chain, h_prf, h_cipher_chain, NULL, NULL, 0, 1 /* interactive */, @@ -295,14 +296,14 @@ error = info_volume(map_name, dev, sflag, sys_dev, protect_hidden, keyfiles, nkeyfiles, h_keyfiles, n_hkeyfiles, NULL, NULL, 1 /* interactive */, DEFAULT_RETRIES, 0); - } else if (map_vol) { + } /*else if (map_vol) { g_gate_load_module(); g_gate_open_device(); error = map_volume(map_name, dev, sflag, sys_dev, protect_hidden, keyfiles, nkeyfiles, h_keyfiles, n_hkeyfiles, NULL, NULL, - 1 /* interactive */, DEFAULT_RETRIES, 0); - } + 1 (comment: interactive ), DEFAULT_RETRIES, 0); + }*/ g_gate_close_device(); exit(EXIT_SUCCESS); return error; Modified: soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c Fri Jul 13 06:46:09 2012 (r239332) +++ soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c Fri Jul 13 07:18:09 2012 (r239333) @@ -414,7 +414,7 @@ } int -create_volume(const char *map_name, const char *dev, int hidden, const char *keyfiles[], int nkeyfiles, +create_volume(const char *map_name, const char *dev, int sflag, const char *sys_dev, int protect_hidden, int hidden, const char *keyfiles[], int nkeyfiles, const char *h_keyfiles[], int n_hkeyfiles, struct pbkdf_prf_algo *prf_algo, struct tc_cipher_chain *cipher_chain, struct pbkdf_prf_algo *h_prf_algo, struct tc_cipher_chain *h_cipher_chain, char *passphrase, @@ -456,6 +456,14 @@ "than %d bytes\n", MIN_VOL_BYTES); return -1; } + if (( error = map_volume(map_name, + dev, sflag, sys_dev, protect_hidden, + keyfiles, nkeyfiles, h_keyfiles, n_hkeyfiles, NULL, NULL, + 1 /* interactive */, DEFAULT_RETRIES, 0))) { + tc_log(1, "Failed to map volume\n"); + goto out; + } + if (interactive) { if (((pass = alloc_safe_mem(MAX_PASSSZ)) == NULL) || Modified: soc2012/vchan/gtcp/bwalex-tc-play/tcplay.h ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/tcplay.h Fri Jul 13 06:46:09 2012 (r239332) +++ soc2012/vchan/gtcp/bwalex-tc-play/tcplay.h Fri Jul 13 07:18:09 2012 (r239333) @@ -186,7 +186,7 @@ int adjust_info(struct tcplay_info *info, struct tcplay_info *hinfo); int process_hdr(const char *dev, int sflag, unsigned char *pass, int passlen, struct tchdr_enc *ehdr, struct tcplay_info **pinfo); -int create_volume(const char *map_name, const char *dev, int hidden, const char *keyfiles[], +int create_volume(const char *map_name, const char *dev, int sflag, const char *sys_dev, int protect_hidden, int hidden, const char *keyfiles[], int nkeyfiles, const char *h_keyfiles[], int n_hkeyfiles, struct pbkdf_prf_algo *prf_algo, struct tc_cipher_chain *cipher_chain, struct pbkdf_prf_algo *h_prf_algo, struct tc_cipher_chain *h_cipher_chain,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120713071810.111D01065672>