Commit aae41a63 authored by Kirill Tkhai's avatar Kirill Tkhai Committed by Andrei Vagin

unix: Split collect_one_unixsk()

Extract the functionality, which makes socket memory initialization.
Signed-off-by: 's avatarKirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent 7a5919cc
......@@ -1607,24 +1607,19 @@ static int post_prepare_unix_sk(struct pprep_head *ph)
return 0;
}
static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
static int init_unix_sk_info(struct unix_sk_info *ui, UnixSkEntry *ue)
{
struct unix_sk_info *ui = o;
char *uname, *prefix = "";
int ulen;
ui->ue = pb_msg(base, UnixSkEntry);
ui->name_dir = (void *)ui->ue->name_dir;
if (ui->ue->name.len) {
if (ui->ue->name.len > UNIX_PATH_MAX) {
pr_err("Bad unix name len %d\n", (int)ui->ue->name.len);
ui->ue = ue;
if (ue->name.len) {
if (ue->name.len > UNIX_PATH_MAX) {
pr_err("Bad unix name len %d\n", (int)ue->name.len);
return -1;
}
ui->name = (void *)ui->ue->name.data;
ui->name = (void *)ue->name.data;
} else
ui->name = NULL;
ui->name_dir = (void *)ue->name_dir;
ui->queuer = NULL;
ui->peer = NULL;
......@@ -1637,6 +1632,18 @@ static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
INIT_LIST_HEAD(&ui->scm_fles);
ui->flags = 0;
return 0;
}
static int collect_one_unixsk(void *o, ProtobufCMessage *base, struct cr_img *i)
{
struct unix_sk_info *ui = o;
char *uname, *prefix = "";
int ulen;
if (init_unix_sk_info(ui, pb_msg(base, UnixSkEntry)))
return -1;
uname = ui->name;
ulen = ui->ue->name.len;
if (ulen > 0 && uname[0] == 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment