MarkBase架构升级:Multi-Volume Virtual Tree + Dual-View Management + Git Remote修正
核心功能: - ✅ Categories/Series双视图管理(category_view.rs + import_markdown.rs) - ✅ FUSE Multi-Volume支持(tree_type参数) - ✅ SSH/SFTP/SCP/rsync协议完整实现(4042行) - ✅ NFS/SMB Module Phase 1-3完成 - ✅ Archive Module Phase 1-4完成(2916行) - ✅ Download Center API完整实现 - ✅ S3兼容API实现(560行) Git配置修正: - ✅ 删除错误origin(gitea.momentry.ddns.net) - ✅ 删除m5max128(指向机器名) - ✅ 设置origin = m5max128gitea.momentry.ddns.net/admin/markbase - ✅ 设置m4minigitea = m4minigitea.momentry.ddns.net/warren/markbase 数据清理: - ✅ 删除38个临时SQLite(保留accusys.sqlite、demo.sqlite) - ✅ 删除.bak、test_*.bin、调试脚本等临时文件 - ✅ 删除临时目录(build/、download files/、raid_test/等) - ✅ 更新.gitignore排除临时文件 架构优化: - 52个文件修改,2434行新增,4739行删除 - Workspace成员整合(16个crate) - 数据库状态:accusys.sqlite保留(主demo测试) 远程同步: - ✅ 准备推送到m5max128gitea(远程Gitea) - ✅ 准备推送到m4minigitea(本地Gitea)
This commit is contained in:
109
rust-iscsi-initiator/src/discovery/mod.rs
Normal file
109
rust-iscsi-initiator/src/discovery/mod.rs
Normal file
@@ -0,0 +1,109 @@
|
||||
use crate::connection::IscsiConnection;
|
||||
use crate::pdu::{IscsiPdu, Opcode};
|
||||
|
||||
use crate::Result;
|
||||
|
||||
/// Target discovery
|
||||
pub struct Discovery {
|
||||
connection: Option<IscsiConnection>,
|
||||
}
|
||||
|
||||
impl Discovery {
|
||||
/// Create new discovery instance
|
||||
pub fn new() -> Self {
|
||||
Self { connection: None }
|
||||
}
|
||||
|
||||
/// Connect to discovery portal
|
||||
pub async fn connect(&mut self, addr: &str) -> Result<()> {
|
||||
let conn = IscsiConnection::connect(addr).await?;
|
||||
self.connection = Some(conn);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Send SendTargets discovery request
|
||||
pub async fn send_targets(&mut self) -> Result<Vec<String>> {
|
||||
if let Some(conn) = &mut self.connection {
|
||||
// Create Text request with SendTargets
|
||||
let mut pdu = IscsiPdu::new(Opcode::TextCmd);
|
||||
pdu.set_data(bytes::Bytes::from("SendTargets=All\n"));
|
||||
|
||||
conn.send_pdu(&pdu).await?;
|
||||
|
||||
let response = conn.recv_pdu().await?;
|
||||
|
||||
// Parse SendTargets response
|
||||
if response.data.len() > 0 {
|
||||
let targets_str = String::from_utf8_lossy(&response.data);
|
||||
let targets = targets_str
|
||||
.lines()
|
||||
.filter(|line| line.starts_with("TargetName="))
|
||||
.map(|line| line.trim_start_matches("TargetName=").trim().to_string())
|
||||
.collect();
|
||||
|
||||
return Ok(targets);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(Vec::new())
|
||||
}
|
||||
|
||||
/// Disconnect from discovery portal
|
||||
pub async fn disconnect(&mut self) -> Result<()> {
|
||||
if let Some(conn) = &mut self.connection {
|
||||
conn.close().await?;
|
||||
self.connection = None;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// Discovery result
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct TargetInfo {
|
||||
/// Target name (IQN)
|
||||
pub target_name: String,
|
||||
|
||||
/// Portal addresses
|
||||
pub portals: Vec<String>,
|
||||
|
||||
/// LUNs available
|
||||
pub luns: Vec<u64>,
|
||||
}
|
||||
|
||||
impl TargetInfo {
|
||||
/// Create new target info
|
||||
pub fn new(target_name: String) -> Self {
|
||||
Self {
|
||||
target_name,
|
||||
portals: Vec::new(),
|
||||
luns: Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Add portal
|
||||
pub fn add_portal(&mut self, portal: String) {
|
||||
self.portals.push(portal);
|
||||
}
|
||||
|
||||
/// Add LUN
|
||||
pub fn add_lun(&mut self, lun: u64) {
|
||||
self.luns.push(lun);
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn test_target_info() {
|
||||
let mut info = TargetInfo::new("iqn.test".to_string());
|
||||
info.add_portal("127.0.0.1:3260".to_string());
|
||||
info.add_lun(0);
|
||||
|
||||
assert_eq!(info.target_name, "iqn.test");
|
||||
assert_eq!(info.portals.len(), 1);
|
||||
assert_eq!(info.luns.len(), 1);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user