From f8f3917842398aca7dd21200b32b049b39190d2e Mon Sep 17 00:00:00 2001 From: "Daniel M. Weeks" Date: Thu, 11 Jun 2015 11:42:42 -0400 Subject: [PATCH] Convert file format DOS->UNIX --- src/sharedmemory.c | 248 +++++++++++++++++++------------------- src/sharedmemory.h | 46 +++---- src/sharedmemory_struct.h | 64 +++++----- 3 files changed, 179 insertions(+), 179 deletions(-) diff --git a/src/sharedmemory.c b/src/sharedmemory.c index c08e4e8..a3c4cf2 100644 --- a/src/sharedmemory.c +++ b/src/sharedmemory.c @@ -1,124 +1,124 @@ -#include "sharedmemory.h" - -int shm_fd; -shm_t *shmptr = NULL; -char shm_file_name[128]; - -void Sharedmemory_init( int bindport, int bindport6 ) -{ - - int server_max_clients = getIntConf(MAX_CLIENTS); - int shmtotal_size = sizeof( shm_t ) + (sizeof( shmclient_t ) * server_max_clients); - - if( !bindport ) - { - bindport = getIntConf(BINDPORT); - } - - sprintf( shm_file_name, "/umurmurd:%i", bindport ); - Log_info("SHM_API: shm_fd=\"%s\"", shm_file_name ); - - shm_fd = shm_open( shm_file_name, O_CREAT | O_RDWR, 0660 ); - if(shm_fd == -1) - { - Log_fatal( "SHM_API: Open failed:%s\n", strerror(errno)); - exit(EXIT_FAILURE); - } - - if( ftruncate( shm_fd, shmtotal_size ) == -1 ) - { - Sharedmemory_deinit(); - Log_fatal( "SHM_API: ftruncate : %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } - - shmptr = mmap( 0, shmtotal_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0 ); - if (shmptr == MAP_FAILED) - { - Log_fatal( "SHM_API: mmap failed : %s\n", strerror(errno)); - exit(EXIT_FAILURE); - } - - memset( shmptr, 0, shmtotal_size ); - - shmptr->umurmurd_pid = getpid(); - shmptr->server_max_clients = server_max_clients; - shmptr->shmtotal_size = shmtotal_size; - shmptr->shmclient_size = sizeof( shmclient_t ) * shmptr->server_max_clients; - -} - -void Sharedmemory_update(void) -{ - - uint64_t now; - unsigned int cc = 0; - client_t *client_itr = NULL; - - memset( &shmptr->client[0], 0, shmptr->shmclient_size ); - shmptr->clientcount = Client_count(); - - if( shmptr->clientcount ) - { - Timer_init( &now ); - while( Client_iterate(&client_itr) != NULL ) - { - if( client_itr->authenticated ) - { - channel_t *channel = client_itr->channel; - - char* clientAddressString = Util_clientAddressToString( client_itr ); - - strncpy( shmptr->client[cc].username, client_itr->username, 120 ); - strncpy( shmptr->client[cc].ipaddress, clientAddressString, INET6_ADDRSTRLEN - 1 ); - strncpy( shmptr->client[cc].channel, channel->name, 120 ); - - strncpy( shmptr->client[cc].os, client_itr->os, 120 ); - strncpy( shmptr->client[cc].release, client_itr->release, 120 ); - strncpy( shmptr->client[cc].os_version, client_itr->os_version, 120 ); - - shmptr->client[cc].tcp_port = Util_clientAddressToPortTCP( client_itr ); - shmptr->client[cc].udp_port = Util_clientAddressToPortUDP( client_itr ); - - shmptr->client[cc].online_secs = ( now - client_itr->connectTime ) / 1000000LL; - shmptr->client[cc].idle_secs = ( now - client_itr->idleTime ) / 1000000LL; - - shmptr->client[cc].bUDP = client_itr->bUDP; - shmptr->client[cc].deaf = client_itr->deaf; - shmptr->client[cc].mute = client_itr->mute; - shmptr->client[cc].bOpus = client_itr->bOpus; - shmptr->client[cc].self_deaf = client_itr->self_deaf; - shmptr->client[cc].self_mute = client_itr->self_mute; - shmptr->client[cc].recording = client_itr->recording; - shmptr->client[cc].authenticated = client_itr->authenticated; - - shmptr->client[cc].availableBandwidth = client_itr->availableBandwidth; - - shmptr->client[cc].UDPPingAvg = client_itr->UDPPingAvg; - shmptr->client[cc].UDPPingVar = client_itr->UDPPingVar; - shmptr->client[cc].TCPPingAvg = client_itr->TCPPingAvg; - shmptr->client[cc].TCPPingVar = client_itr->TCPPingVar; - - shmptr->client[cc].isAdmin = client_itr->isAdmin; - shmptr->client[cc].isSuppressed = client_itr->isSuppressed; - - shmptr->client[cc].UDPPackets = client_itr->UDPPackets; - shmptr->client[cc].TCPPackets = client_itr->TCPPackets; - - free(clientAddressString); - } - cc++; - } - } -} -void Sharedmemory_alivetick(void) -{ - shmptr->alive++; -} - -void Sharedmemory_deinit(void) -{ - close( shm_fd ); - shm_unlink( shm_file_name ); - shmptr->umurmurd_pid = 0; -} +#include "sharedmemory.h" + +int shm_fd; +shm_t *shmptr = NULL; +char shm_file_name[128]; + +void Sharedmemory_init( int bindport, int bindport6 ) +{ + + int server_max_clients = getIntConf(MAX_CLIENTS); + int shmtotal_size = sizeof( shm_t ) + (sizeof( shmclient_t ) * server_max_clients); + + if( !bindport ) + { + bindport = getIntConf(BINDPORT); + } + + sprintf( shm_file_name, "/umurmurd:%i", bindport ); + Log_info("SHM_API: shm_fd=\"%s\"", shm_file_name ); + + shm_fd = shm_open( shm_file_name, O_CREAT | O_RDWR, 0660 ); + if(shm_fd == -1) + { + Log_fatal( "SHM_API: Open failed:%s\n", strerror(errno)); + exit(EXIT_FAILURE); + } + + if( ftruncate( shm_fd, shmtotal_size ) == -1 ) + { + Sharedmemory_deinit(); + Log_fatal( "SHM_API: ftruncate : %s\n", strerror(errno)); + exit(EXIT_FAILURE); + } + + shmptr = mmap( 0, shmtotal_size, PROT_READ | PROT_WRITE, MAP_SHARED, shm_fd, 0 ); + if (shmptr == MAP_FAILED) + { + Log_fatal( "SHM_API: mmap failed : %s\n", strerror(errno)); + exit(EXIT_FAILURE); + } + + memset( shmptr, 0, shmtotal_size ); + + shmptr->umurmurd_pid = getpid(); + shmptr->server_max_clients = server_max_clients; + shmptr->shmtotal_size = shmtotal_size; + shmptr->shmclient_size = sizeof( shmclient_t ) * shmptr->server_max_clients; + +} + +void Sharedmemory_update(void) +{ + + uint64_t now; + unsigned int cc = 0; + client_t *client_itr = NULL; + + memset( &shmptr->client[0], 0, shmptr->shmclient_size ); + shmptr->clientcount = Client_count(); + + if( shmptr->clientcount ) + { + Timer_init( &now ); + while( Client_iterate(&client_itr) != NULL ) + { + if( client_itr->authenticated ) + { + channel_t *channel = client_itr->channel; + + char* clientAddressString = Util_clientAddressToString( client_itr ); + + strncpy( shmptr->client[cc].username, client_itr->username, 120 ); + strncpy( shmptr->client[cc].ipaddress, clientAddressString, INET6_ADDRSTRLEN - 1 ); + strncpy( shmptr->client[cc].channel, channel->name, 120 ); + + strncpy( shmptr->client[cc].os, client_itr->os, 120 ); + strncpy( shmptr->client[cc].release, client_itr->release, 120 ); + strncpy( shmptr->client[cc].os_version, client_itr->os_version, 120 ); + + shmptr->client[cc].tcp_port = Util_clientAddressToPortTCP( client_itr ); + shmptr->client[cc].udp_port = Util_clientAddressToPortUDP( client_itr ); + + shmptr->client[cc].online_secs = ( now - client_itr->connectTime ) / 1000000LL; + shmptr->client[cc].idle_secs = ( now - client_itr->idleTime ) / 1000000LL; + + shmptr->client[cc].bUDP = client_itr->bUDP; + shmptr->client[cc].deaf = client_itr->deaf; + shmptr->client[cc].mute = client_itr->mute; + shmptr->client[cc].bOpus = client_itr->bOpus; + shmptr->client[cc].self_deaf = client_itr->self_deaf; + shmptr->client[cc].self_mute = client_itr->self_mute; + shmptr->client[cc].recording = client_itr->recording; + shmptr->client[cc].authenticated = client_itr->authenticated; + + shmptr->client[cc].availableBandwidth = client_itr->availableBandwidth; + + shmptr->client[cc].UDPPingAvg = client_itr->UDPPingAvg; + shmptr->client[cc].UDPPingVar = client_itr->UDPPingVar; + shmptr->client[cc].TCPPingAvg = client_itr->TCPPingAvg; + shmptr->client[cc].TCPPingVar = client_itr->TCPPingVar; + + shmptr->client[cc].isAdmin = client_itr->isAdmin; + shmptr->client[cc].isSuppressed = client_itr->isSuppressed; + + shmptr->client[cc].UDPPackets = client_itr->UDPPackets; + shmptr->client[cc].TCPPackets = client_itr->TCPPackets; + + free(clientAddressString); + } + cc++; + } + } +} +void Sharedmemory_alivetick(void) +{ + shmptr->alive++; +} + +void Sharedmemory_deinit(void) +{ + close( shm_fd ); + shm_unlink( shm_file_name ); + shmptr->umurmurd_pid = 0; +} diff --git a/src/sharedmemory.h b/src/sharedmemory.h index b668c32..52618a7 100644 --- a/src/sharedmemory.h +++ b/src/sharedmemory.h @@ -1,23 +1,23 @@ -#ifndef SHAREDMEMORY_H_777736932196 -#define SHAREDMEMORY_H_777736932196 - -#include -#include - -#include /* For O_* constants */ -#include -#include - -#include -#include "util.h" -#include "conf.h" -#include "client.h" -#include "channel.h" -#include "sharedmemory_struct.h" - -void Sharedmemory_init( int bindport, int bindport6 ); -void Sharedmemory_update(void); -void Sharedmemory_alivetick(void); -void Sharedmemory_deinit(void); - -#endif // SHAREDMEMORY_H_777736932196 \ No newline at end of file +#ifndef SHAREDMEMORY_H_777736932196 +#define SHAREDMEMORY_H_777736932196 + +#include +#include + +#include /* For O_* constants */ +#include +#include + +#include +#include "util.h" +#include "conf.h" +#include "client.h" +#include "channel.h" +#include "sharedmemory_struct.h" + +void Sharedmemory_init( int bindport, int bindport6 ); +void Sharedmemory_update(void); +void Sharedmemory_alivetick(void); +void Sharedmemory_deinit(void); + +#endif // SHAREDMEMORY_H_777736932196 diff --git a/src/sharedmemory_struct.h b/src/sharedmemory_struct.h index de356c4..e696948 100644 --- a/src/sharedmemory_struct.h +++ b/src/sharedmemory_struct.h @@ -1,32 +1,32 @@ -#include -#include -#include "types.h" - -typedef struct -{ - - char username[121]; - char ipaddress[INET6_ADDRSTRLEN]; - char channel[121]; - char os[121], release[121], os_version[121]; - int tcp_port, udp_port; - bool_t bUDP, authenticated, deaf, mute, self_deaf, self_mute, recording, bOpus; - int availableBandwidth; - uint32_t online_secs, idle_secs; - bool_t isAdmin; - bool_t isSuppressed; - float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar; - uint32_t UDPPackets, TCPPackets; - -}shmclient_t; - -typedef struct -{ - - int shmtotal_size, shmclient_size; - int clientcount, server_max_clients; - unsigned int umurmurd_pid; - uint8_t alive; - shmclient_t client[]; - -}shm_t; +#include +#include +#include "types.h" + +typedef struct +{ + + char username[121]; + char ipaddress[INET6_ADDRSTRLEN]; + char channel[121]; + char os[121], release[121], os_version[121]; + int tcp_port, udp_port; + bool_t bUDP, authenticated, deaf, mute, self_deaf, self_mute, recording, bOpus; + int availableBandwidth; + uint32_t online_secs, idle_secs; + bool_t isAdmin; + bool_t isSuppressed; + float UDPPingAvg, UDPPingVar, TCPPingAvg, TCPPingVar; + uint32_t UDPPackets, TCPPackets; + +} shmclient_t; + +typedef struct +{ + + int shmtotal_size, shmclient_size; + int clientcount, server_max_clients; + unsigned int umurmurd_pid; + uint8_t alive; + shmclient_t client[]; + +} shm_t; -- 2.30.2