[porthole] added missing file and adjusted linux code

This commit is contained in:
Geoffrey McRae 2019-11-12 15:55:13 +11:00
parent 416c4bbb48
commit 7aee4eed11
3 changed files with 34 additions and 3 deletions

View File

@ -1 +1 @@
B1-42-g76007092d5+1
B1-43-g83047cbc3e+1

View File

@ -429,8 +429,8 @@ static void porthole_do_map(PortholeClient handle, Mapping * map, const uint32_t
for(unsigned int i = 0; i < count; ++i)
{
Segment * seg = (Segment *)objectlist_at(map->segments, i);
m->segments[i].size = seg->size;
m->segments[i].data = seg->sfd->map + seg->addr;
PH_SEGMENTS(m)[i].size = seg->size;
PH_SEGMENTS(m)[i].data = seg->sfd->map + seg->addr;
}
objectlist_push(handle->maps, m);

31
porthole/src/types.h Normal file
View File

@ -0,0 +1,31 @@
/*
Looking Glass - KVM FrameRelay (KVMFR) Client
Copyright (C) 2017-2019 Geoffrey McRae <geoff@hostfission.com>
https://looking-glass.hostfission.com
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any later
version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
*/
#pragma once
#include "porthole/types.h"
typedef struct
{
unsigned int size;
void * data;
}
PortholeSegment;
#define PH_SEGMENTS(map) ((PortholeSegment *)((&map)+1))