Jan Kiszka <[EMAIL PROTECTED]> a écrit :
Bruno Carlus wrote:
Jan Kiszka a écrit :
Bruno Carlus wrote:
Hello !
I've got a RTnet network (two xenomai machines actually...) running
and would like to run a PTP (time synchronizing) software through it.
[Source available at http://ptpd.sourceforge.net/]
The software compiles ok with xenomai/posix wrapping options but
cannot run and exits within the following code:
if(ioctl(netPath->eventSock, SIOCGIFADDR, &device[i]) < 0)
{
PERROR("failed to get ip address");
return 0;
}
(don't know if the information will be enough ...)
SIOCGIFADDR is not implemented in the core. You could either switch
ptpd to use SIOCGIFCONF or add the few required lines to RTnet. This
would be the place for them:
http://www.rts.uni-hannover.de/rtnet/lxr/source/stack/socket.c#225
The network itself is running ok with rtping or other pieces of code.
So I wonder if my compilation method is really the good one or if
there are other linking to be done with the ioctl function ?
Other question: what is the status of the RTnet multicast support
core and nic drivers?
Basically, we are lacking an efficient but still RT-capable
rtskb_clone for true multicast support. We do have some rtskb_clone
already for ETH_P_ALL support, but it simply copies the payload which
does no scale well and does not allow to isolate the users from each
other.
For sure, one could bake a single user (==single receiver) approach
for now. There used to be some patches for this (with 8139 driver
support), just search the archive. They were never merged as the
needed some refactorings first.
Jan
Thank you Jan !
I patched the socket.c file to implement the SIOCGIFADDR option.
I'm always open to review and merge patches... :->
I send you the modified file (very few lines in the rt_socket_if_ioctl
function actually ...)
But I'm now of course stopped by the multicast initialization.
I couldn't find so far in any messages in the archive the Amine's patches.
Does anyone know where I could find them?
Check gmane.org e.g. I'm subscribed to its news server, and typing in
"multicast" made TB show me the thread "Patch for multicast support for
RTnet" within a second.
Ok ... I found it. I will have to digest the whole thing and may have
questions soon !
Jan
Tanks a lot!
Bruno.
/***
*
* stack/socket.c - sockets implementation for rtnet
*
* Copyright (C) 1999 Lineo, Inc
* 1999, 2002 David A. Schleef <[EMAIL PROTECTED]>
* 2002 Ulrich Marx <[EMAIL PROTECTED]>
* 2003-2005 Jan Kiszka <[EMAIL PROTECTED]>
*
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*
*/
#include <linux/moduleparam.h>
#include <linux/spinlock.h>
#include <linux/socket.h>
#include <linux/in.h>
#include <linux/ip.h>
#include <linux/tcp.h>
#include <asm/bitops.h>
#include <rtnet.h>
#include <rtnet_internal.h>
#include <rtnet_iovec.h>
#include <rtnet_socket.h>
#include <ipv4/protocol.h>
#define SKB_POOL_CLOSED RTDM_USER_CONTEXT_FLAG + 0
static unsigned int socket_rtskbs = DEFAULT_SOCKET_RTSKBS;
module_param(socket_rtskbs, uint, 0444);
MODULE_PARM_DESC(socket_rtskbs, "Default number of realtime socket buffers in socket pools");
/************************************************************************
* internal socket functions *
************************************************************************/
/***
* rt_socket_init - initialises a new socket structure
*/
int rt_socket_init(struct rtdm_dev_context *sockctx)
{
struct rtsocket *sock = (struct rtsocket *)&sockctx->dev_private;
unsigned int pool_size;
sock->priority =
RTSKB_PRIO_VALUE(SOCK_DEF_PRIO, RTSKB_DEF_RT_CHANNEL);
sock->callback_func = NULL;
rtskb_queue_init(&sock->incoming);
sock->timeout = 0;
rtdm_lock_init(&sock->param_lock);
rtdm_sem_init(&sock->pending_sem, 0);
if (test_bit(RTDM_CREATED_IN_NRT, &sockctx->context_flags))
pool_size = rtskb_pool_init(&sock->skb_pool, socket_rtskbs);
else
pool_size = rtskb_pool_init_rt(&sock->skb_pool, socket_rtskbs);
atomic_set(&sock->pool_size, pool_size);
if (pool_size < socket_rtskbs) {
/* fix statistics */
if (pool_size == 0)
rtskb_pools--;
rt_socket_cleanup(sockctx);
return -ENOMEM;
}
return 0;
}
/***
* rt_socket_cleanup - releases resources allocated for the socket
*/
int rt_socket_cleanup(struct rtdm_dev_context *sockctx)
{
struct rtsocket *sock = (struct rtsocket *)&sockctx->dev_private;
unsigned int rtskbs;
rtdm_lockctx_t context;
rtdm_sem_destroy(&sock->pending_sem);
rtdm_lock_get_irqsave(&sock->param_lock, context);
set_bit(SKB_POOL_CLOSED, &sockctx->context_flags);
rtskbs = atomic_read(&sock->pool_size);
rtdm_lock_put_irqrestore(&sock->param_lock, context);
if (rtskbs > 0) {
if (test_bit(RTDM_CREATED_IN_NRT, &sockctx->context_flags)) {
rtskbs = rtskb_pool_shrink(&sock->skb_pool, rtskbs);
atomic_sub(rtskbs, &sock->pool_size);
if (atomic_read(&sock->pool_size) > 0)
return -EAGAIN;
rtskb_pool_release(&sock->skb_pool);
} else {
rtskbs = rtskb_pool_shrink_rt(&sock->skb_pool, rtskbs);
atomic_sub(rtskbs, &sock->pool_size);
if (atomic_read(&sock->pool_size) > 0)
return -EAGAIN;
rtskb_pool_release_rt(&sock->skb_pool);
}
}
return 0;
}
/***
* rt_socket_common_ioctl
*/
int rt_socket_common_ioctl(struct rtdm_dev_context *sockctx,
rtdm_user_info_t *user_info,
int request, void *arg)
{
struct rtsocket *sock = (struct rtsocket *)&sockctx->dev_private;
int ret = 0;
struct rtnet_callback *callback = arg;
unsigned int rtskbs;
rtdm_lockctx_t context;
switch (request) {
case RTNET_RTIOC_XMITPARAMS:
sock->priority = *(unsigned int *)arg;
break;
case RTNET_RTIOC_TIMEOUT:
sock->timeout = *(nanosecs_rel_t *)arg;
break;
case RTNET_RTIOC_CALLBACK:
if (user_info)
return -EACCES;
rtdm_lock_get_irqsave(&sock->param_lock, context);
sock->callback_func = callback->func;
sock->callback_arg = callback->arg;
rtdm_lock_put_irqrestore(&sock->param_lock, context);
break;
case RTNET_RTIOC_EXTPOOL:
rtskbs = *(unsigned int *)arg;
rtdm_lock_get_irqsave(&sock->param_lock, context);
if (test_bit(SKB_POOL_CLOSED, &sockctx->context_flags)) {
rtdm_lock_put_irqrestore(&sock->param_lock, context);
return -EBADF;
}
atomic_add(rtskbs, &sock->pool_size);
rtdm_lock_put_irqrestore(&sock->param_lock, context);
if (test_bit(RTDM_CREATED_IN_NRT, &sockctx->context_flags)) {
if (rtdm_in_rt_context())
return -EACCES;
ret = rtskb_pool_extend(&sock->skb_pool, rtskbs);
} else
ret = rtskb_pool_extend_rt(&sock->skb_pool, rtskbs);
atomic_sub(rtskbs-ret, &sock->pool_size);
break;
case RTNET_RTIOC_SHRPOOL:
rtskbs = *(unsigned int *)arg;
rtdm_lock_get_irqsave(&sock->param_lock, context);
if (test_bit(SKB_POOL_CLOSED, &sockctx->context_flags)) {
rtdm_lock_put_irqrestore(&sock->param_lock, context);
return -EBADF;
}
atomic_sub(rtskbs, &sock->pool_size);
rtdm_lock_put_irqrestore(&sock->param_lock, context);
if (test_bit(RTDM_CREATED_IN_NRT, &sockctx->context_flags)) {
if (rtdm_in_rt_context())
return -EACCES;
ret = rtskb_pool_shrink(&sock->skb_pool, *(unsigned int *)arg);
} else
ret = rtskb_pool_shrink_rt(&sock->skb_pool,
*(unsigned int *)arg);
atomic_add(rtskbs-ret, &sock->pool_size);
break;
default:
ret = -EOPNOTSUPP;
break;
}
return ret;
}
/***
* rt_socket_if_ioctl
*/
int rt_socket_if_ioctl(struct rtdm_dev_context *sockctx,
rtdm_user_info_t *user_info, int request, void *arg)
{
struct rtnet_device *rtdev;
struct ifreq *ifr = arg;
struct sockaddr_in *sin;
int ret = 0;
if (request == SIOCGIFCONF) {
struct ifconf *ifc = arg;
struct ifreq *cur_ifr = ifc->ifc_req;
int size = 0;
int i;
for (i = 1; i <= MAX_RT_DEVICES; i++) {
rtdev = rtdev_get_by_index(i);
if (rtdev != NULL) {
if ((rtdev->flags & IFF_RUNNING) == 0) {
rtdev_dereference(rtdev);
continue;
}
size += sizeof(struct ifreq);
if (size > ifc->ifc_len) {
rtdev_dereference(rtdev);
size = ifc->ifc_len;
break;
}
strncpy(cur_ifr->ifr_name, rtdev->name,
IFNAMSIZ);
sin = (struct sockaddr_in *)&cur_ifr->ifr_addr;
sin->sin_family = AF_INET;
sin->sin_addr.s_addr = rtdev->local_ip;
cur_ifr++;
rtdev_dereference(rtdev);
}
}
ifc->ifc_len = size;
return 0;
}
rtdev = rtdev_get_by_name(ifr->ifr_name);
if (rtdev == NULL)
return -ENODEV;
switch (request) {
case SIOCGIFINDEX:
ifr->ifr_ifindex = rtdev->ifindex;
break;
case SIOCGIFFLAGS:
ifr->ifr_flags = rtdev->flags;
break;
case SIOCGIFHWADDR:
memcpy(ifr->ifr_hwaddr.sa_data, rtdev->dev_addr, rtdev->addr_len);
ifr->ifr_hwaddr.sa_family = rtdev->type;
break;
case SIOCGIFADDR:
sin = (struct sockaddr_in *)&ifr->ifr_addr;
sin->sin_family = AF_INET;
sin->sin_addr.s_addr = rtdev->local_ip;
break;
case SIOCETHTOOL:
if (rtdev->do_ioctl != NULL)
ret = rtdev->do_ioctl(rtdev, request, arg);
else
ret = -EOPNOTSUPP;
break;
default:
ret = -EOPNOTSUPP;
break;
}
rtdev_dereference(rtdev);
return ret;
}
EXPORT_SYMBOL(rt_socket_init);
EXPORT_SYMBOL(rt_socket_cleanup);
EXPORT_SYMBOL(rt_socket_common_ioctl);
EXPORT_SYMBOL(rt_socket_if_ioctl);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
RTnet-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rtnet-users
