Date: Fri, 06 Jul 2012 01:23:24 +0000 From: vchan@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r239026 - soc2012/vchan/gtcp/bwalex-tc-play Message-ID: <20120706012324.65C49106564A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vchan Date: Fri Jul 6 01:23:23 2012 New Revision: 239026 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239026 Log: fixed all functions but not tested Modified: soc2012/vchan/gtcp/bwalex-tc-play/crypto-dev.c soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c Modified: soc2012/vchan/gtcp/bwalex-tc-play/crypto-dev.c ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/crypto-dev.c Fri Jul 6 00:58:27 2012 (r239025) +++ soc2012/vchan/gtcp/bwalex-tc-play/crypto-dev.c Fri Jul 6 01:23:23 2012 (r239026) @@ -78,14 +78,26 @@ return CRYPTO_AES_XTS; else if (strcmp(cipher->name, "AES-256-XTS") == 0) return CRYPTO_AES_XTS; - else if (strcmp(cipher->name, "TWOFISH-128-XTS") == 0) - return CRYPTO_TWOFISH_XTS; - else if (strcmp(cipher->name, "TWOFISH-256-XTS") == 0) - return CRYPTO_TWOFISH_XTS; - else if (strcmp(cipher->name, "SERPENT-128-XTS") == 0) - return CRYPTO_SERPENT_XTS; - else if (strcmp(cipher->name, "SERPENT-256-XTS") == 0) - return CRYPTO_SERPENT_XTS; + else if (strcmp(cipher->name, "TWOFISH-128-XTS") == 0) { + fprintf(stderr, "TWOFISH-128-XTS not available on FreeBSD.\n"); + //return CRYPTO_TWOFISH_XTS; + return -1; + } + else if (strcmp(cipher->name, "TWOFISH-256-XTS") == 0) { + fprintf(stderr, "TWOFISH-256-XTS not available on FreeBSD.\n"); + //return CRYPTO_TWOFISH_XTS; + return -1; + } + else if (strcmp(cipher->name, "SERPENT-128-XTS") == 0) { + fprintf(stderr, "SERPENT-128-XTS not available on FreeBSD.\n"); + //return CRYPTO_SERPENT_XTS; + return -1; + } + else if (strcmp(cipher->name, "SERPENT-256-XTS") == 0) { + fprintf(stderr, "SERPENT-256-XTS not available on FreeBSD.\n"); + //return CRYPTO_SERPENT_XTS; + return -1; + } else return -1; } Modified: soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c ============================================================================== --- soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c Fri Jul 6 00:58:27 2012 (r239025) +++ soc2012/vchan/gtcp/bwalex-tc-play/tcplay.c Fri Jul 6 01:23:23 2012 (r239026) @@ -68,6 +68,10 @@ int tc_internal_verbose = 1; char tc_internal_log_buffer[LOG_BUFFER_SZ]; +/* new for FreeBSD */ +static int unit = G_GATE_UNIT_AUTO; +static int force = 0; + void tc_log(int is_err, const char *fmt, ...) { @@ -923,7 +927,7 @@ return -1; } - +/* int map_volume(const char *map_name, const char *device, int sflag, const char *sys_dev, int protect_hidden, const char *keyfiles[], @@ -957,8 +961,25 @@ return 0; } +*/ -/*fix*/ +static +void +dm_remove_device() +{ + int ret = EINVAL; + + force = 1; + + if (unit == -1) { + fprintf(stderr, "Required unit number.\n"); + } + + g_gate_verbose = 1; + g_gate_open_device(); + g_gate_destroy(unit, force); + +/* static int dm_remove_device(const char *name) @@ -978,31 +999,32 @@ ret = 0; out: if (dmt) - /*fix*/dm_task_destroy(dmt); - + dm_task_destroy(dmt); +*/ return ret; } int dm_setup(const char *mapname, struct tcplay_info *info) { + /* Commented out variables not needed in freeBSD*/ struct tc_cipher_chain *cipher_chain; - struct dm_task *dmt = NULL; - struct dm_info dmi; +// struct dm_task *dmt = NULL; +// struct dm_info dmi; char *params = NULL; - char *uu; +// char *uu; char *uu_stack[64]; int uu_stack_idx; -/*#if defined(__DragonFly__)*/ +/*#if defined(__DragonFly__) uint32_t status; -/*#endif*/ +#endif*/ int r, ret = 0; int j; off_t start, offset; char dev[PATH_MAX]; char map[PATH_MAX]; uint32_t cookie; - static int force = 0; //new for FreeBSD + /* dm_udev_set_sync_support(1); */ @@ -1035,13 +1057,14 @@ #ifdef DEBUG printf("Params: %s\n", params); #endif - /* changed from, "if ((dmt = dm_task_create(DM_DEVICE_CREATE)) == NULL)" */ - if ((dmt = g_gatel_create()) == 1) { - tc_log(1, "g_gatel_create failed\n"); + /* + if ((dmt = dm_task_create(DM_DEVICE_CREATE)) == NULL) { + tc_log(1, "dm_task_create failed\n"); ret = -1; goto out; } - + */ + /* * If this is the last element in the cipher chain, use the * final map name. Otherwise pick a secondary name... @@ -1129,7 +1152,7 @@ start = 0; sprintf(dev, "/dev/mapper/%s.%d", mapname, j); - g_gate_destroy(dmt, force); /* was dm_task_destroy(dmt); */ + g_gate_destroy(unit, force); /* was dm_task_destroy(dmt); */ /*not needed in FreeBSD dm_task_update_nodes(); */ }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120706012324.65C49106564A>