Skip to content

Commit

Permalink
cosmetics: follow coding guidelines in CTCPServer
Browse files Browse the repository at this point in the history
  • Loading branch information
@Montellese
Montellese committed May 19, 2013
1 parent 0da9a79 commit 76271f7
Showing 1 changed file with 35 additions and 35 deletions.
70 changes: 35 additions & 35 deletions xbmc/network/TCPServer.cpp
View file
Expand Up @@ -253,7 +253,7 @@ bool CTCPServer::Initialize()
started |= InitializeBlue();
started |= InitializeTCP();

if(started)
if (started)
{
CAnnouncementManager::AddAnnouncer(this);
CLog::Log(LOGINFO, "JSONRPC Server: Successfully initialized");
Expand All @@ -264,13 +264,13 @@ bool CTCPServer::Initialize()

bool CTCPServer::InitializeBlue()
{
if(!m_nonlocal)
if (!m_nonlocal)
return false;

#ifdef _WIN32
#ifdef TARGET_WINDOWS

SOCKET fd = socket (AF_BTH, SOCK_STREAM, BTHPROTO_RFCOMM);
if(fd == INVALID_SOCKET)
SOCKET fd = socket(AF_BTH, SOCK_STREAM, BTHPROTO_RFCOMM);
if (fd == INVALID_SOCKET)
{
CLog::Log(LOGINFO, "JSONRPC Server: Unable to get bluetooth socket");
return false;
Expand All @@ -279,23 +279,23 @@ bool CTCPServer::InitializeBlue()
sa.addressFamily = AF_BTH;
sa.port = BT_PORT_ANY;

if(bind(fd, (SOCKADDR*)&sa, sizeof(sa)) < 0)
if (bind(fd, (SOCKADDR*)&sa, sizeof(sa)) < 0)
{
CLog::Log(LOGINFO, "JSONRPC Server: Unable to bind to bluetooth socket");
closesocket(fd);
return false;
}

ULONG optval = TRUE;
if(setsockopt(fd, SOL_RFCOMM, SO_BTH_AUTHENTICATE, (const char*)&optval, sizeof(optval)) == SOCKET_ERROR)
if (setsockopt(fd, SOL_RFCOMM, SO_BTH_AUTHENTICATE, (const char*)&optval, sizeof(optval)) == SOCKET_ERROR)
{
CLog::Log(LOGERROR, "JSONRPC Server: Failed to force authentication for bluetooth socket");
closesocket(fd);
return false;
}

int len = sizeof(sa);
if(getsockname(fd, (SOCKADDR*)&sa, &len) < 0)
if (getsockname(fd, (SOCKADDR*)&sa, &len) < 0)
CLog::Log(LOGERROR, "JSONRPC Server: Failed to get bluetooth port");

if (listen(fd, 10) < 0)
Expand Down Expand Up @@ -325,16 +325,16 @@ bool CTCPServer::InitializeBlue()
service.lpcsaBuffer = &addrinfo;
service.dwNumberOfCsAddrs = 1;

if(WSASetService(&service, RNRSERVICE_REGISTER, 0) == SOCKET_ERROR)
if (WSASetService(&service, RNRSERVICE_REGISTER, 0) == SOCKET_ERROR)
CLog::Log(LOGERROR, "JSONRPC Server: failed to register bluetooth service error %d", WSAGetLastError());

return true;
#endif

#ifdef HAVE_LIBBLUETOOTH

SOCKET fd = socket (AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
if(fd == INVALID_SOCKET)
SOCKET fd = socket(AF_BLUETOOTH, SOCK_STREAM, BTPROTO_RFCOMM);
if (fd == INVALID_SOCKET)
{
CLog::Log(LOGINFO, "JSONRPC Server: Unable to get bluetooth socket");
return false;
Expand All @@ -344,15 +344,15 @@ bool CTCPServer::InitializeBlue()
sa.rc_bdaddr = bt_bdaddr_any;
sa.rc_channel = 0;

if(bind(fd, (struct sockaddr*)&sa, sizeof(sa)) < 0)
if (bind(fd, (struct sockaddr*)&sa, sizeof(sa)) < 0)
{
CLog::Log(LOGINFO, "JSONRPC Server: Unable to bind to bluetooth socket");
closesocket(fd);
return false;
}

socklen_t len = sizeof(sa);
if(getsockname(fd, (struct sockaddr*)&sa, &len) < 0)
if (getsockname(fd, (struct sockaddr*)&sa, &len) < 0)
CLog::Log(LOGERROR, "JSONRPC Server: Failed to get bluetooth port");

if (listen(fd, 10) < 0)
Expand All @@ -377,56 +377,56 @@ bool CTCPServer::InitializeBlue()
sdp_record_t *record = sdp_record_alloc();

// set the general service ID
sdp_uuid128_create( &svc_uuid, &bt_service_guid );
sdp_set_service_id( record, svc_uuid );
sdp_uuid128_create(&svc_uuid, &bt_service_guid);
sdp_set_service_id(record, svc_uuid);

// make the service record publicly browsable
sdp_uuid16_create(&root_uuid, PUBLIC_BROWSE_GROUP);
root_list = sdp_list_append(0, &root_uuid);
sdp_set_browse_groups( record, root_list );
sdp_set_browse_groups(record, root_list);

// set l2cap information
sdp_uuid16_create(&l2cap_uuid, L2CAP_UUID);
l2cap_list = sdp_list_append( 0, &l2cap_uuid );
proto_list = sdp_list_append( 0, l2cap_list );
l2cap_list = sdp_list_append(0, &l2cap_uuid);
proto_list = sdp_list_append(0, l2cap_list);

// set rfcomm information
sdp_uuid16_create(&rfcomm_uuid, RFCOMM_UUID);
channel = sdp_data_alloc(SDP_UINT8, &rfcomm_channel);
rfcomm_list = sdp_list_append( 0, &rfcomm_uuid );
sdp_list_append( rfcomm_list, channel );
sdp_list_append( proto_list, rfcomm_list );
rfcomm_list = sdp_list_append(0, &rfcomm_uuid);
sdp_list_append(rfcomm_list, channel);
sdp_list_append(proto_list, rfcomm_list);

// attach protocol information to service record
access_proto_list = sdp_list_append( 0, proto_list );
sdp_set_access_protos( record, access_proto_list );
access_proto_list = sdp_list_append(0, proto_list);
sdp_set_access_protos(record, access_proto_list);

// set the name, provider, and description
sdp_set_info_attr(record, bt_service_name, bt_service_prov, bt_service_desc);

// set the Service class ID
service_class = sdp_list_append(0, &svc_uuid);
sdp_set_service_classes( record, service_class);
sdp_set_service_classes(record, service_class);

// cleanup
sdp_data_free( channel );
sdp_list_free( l2cap_list, 0 );
sdp_list_free( rfcomm_list, 0 );
sdp_list_free( root_list, 0 );
sdp_list_free( access_proto_list, 0 );
sdp_list_free( service_class, 0 );
sdp_data_free(channel);
sdp_list_free(l2cap_list, 0);
sdp_list_free(rfcomm_list, 0);
sdp_list_free(root_list, 0);
sdp_list_free(access_proto_list, 0);
sdp_list_free(service_class, 0);

// connect to the local SDP server, register the service record
sdp_session_t *session = sdp_connect( &bt_bdaddr_any, &bt_bdaddr_local, SDP_RETRY_IF_BUSY );
if(session == NULL)
sdp_session_t *session = sdp_connect(&bt_bdaddr_any, &bt_bdaddr_local, SDP_RETRY_IF_BUSY);
if (session == NULL)
{
CLog::Log(LOGERROR, "JSONRPC Server: Failed to connect to sdpd");
closesocket(fd);
sdp_record_free(record);
return false;
}

if(sdp_record_register(session, record, 0) < 0)
if (sdp_record_register(session, record, 0) < 0)
{
CLog::Log(LOGERROR, "JSONRPC Server: Failed to register record with error %d", errno);
closesocket(fd);
Expand Down Expand Up @@ -472,8 +472,8 @@ void CTCPServer::Deinitialize()
m_servers.clear();

#ifdef HAVE_LIBBLUETOOTH
if(m_sdpd)
sdp_close( (sdp_session_t*)m_sdpd );
if (m_sdpd)
sdp_close((sdp_session_t*)m_sdpd);
m_sdpd = NULL;
#endif

Expand Down

0 comments on commit 76271f7

Please sign in to comment.