- start checks with Kimi + many fixes
This commit is contained in:
366
AGENTS.md
Normal file
366
AGENTS.md
Normal file
@@ -0,0 +1,366 @@
|
||||
# RTPhone Platform - Agent Guide
|
||||
|
||||
## Project Overview
|
||||
|
||||
RTPhone is a comprehensive real-time communication (RTC) platform developed by VoIP Objects (Sevana) that provides a complete software stack for building VoIP/SIP-based communication applications. It delivers production-ready voice communication capabilities with extensive codec support and cross-platform compatibility.
|
||||
|
||||
The project produces a static library (`librtphone.a`) that can be integrated into larger telephony and communication systems. It provides a JSON-based command interface for easy integration and control.
|
||||
|
||||
## Technology Stack
|
||||
|
||||
- **Language**: C++20
|
||||
- **Build System**: CMake 3.20+
|
||||
- **License**: Mozilla Public License Version 2.0 (see LICENSE_MPL.txt)
|
||||
- **Primary Platforms**: Linux (x64, ARM/Raspberry Pi), Windows (32/64-bit), macOS, Android, iOS
|
||||
|
||||
## Project Structure
|
||||
|
||||
```
|
||||
/home/anand/works/sevana/platform/rtphone/
|
||||
├── src/ # Main source code
|
||||
│ ├── CMakeLists.txt # Main CMake configuration
|
||||
│ ├── engine/ # Core engine modules
|
||||
│ │ ├── agent/ # JSON-based command interface
|
||||
│ │ ├── audio/ # Cross-platform audio I/O handling
|
||||
│ │ ├── endpoint/ # SIP user agent implementation
|
||||
│ │ ├── helper/ # Utility functions (networking, logging, threading)
|
||||
│ │ ├── media/ # Audio codec management and processing
|
||||
│ │ └── engine_config.h # Compile-time configuration
|
||||
│ └── libs/ # Third-party libraries
|
||||
│ ├── resiprocate/ # SIP stack (git submodule)
|
||||
│ ├── libsrtp/ # SRTP library (git submodule)
|
||||
│ ├── libraries/ # Prebuilt platform libraries (git submodule)
|
||||
│ ├── ice/ # ICE (Interactive Connectivity Establishment)
|
||||
│ ├── jrtplib/ # RTP library
|
||||
│ ├── opus/ # Opus codec
|
||||
│ ├── webrtc/ # WebRTC components
|
||||
│ ├── libg729/ # G.729 codec
|
||||
│ ├── libgsm/ # GSM codec
|
||||
│ ├── gsmhr/ # GSM HR codec
|
||||
│ ├── g722/ # G.722 codec
|
||||
│ ├── speexdsp/ # Speex DSP
|
||||
│ ├── libevs/ # EVS codec (optional)
|
||||
│ ├── opencore-amr/ # AMR codec (optional)
|
||||
│ ├── oboe/ # Android low-latency audio
|
||||
│ └── fmt/ # Format library
|
||||
├── build_linux.py # Linux build script
|
||||
├── build_android.py # Android build script
|
||||
├── build_android.sh # Android build script (shell)
|
||||
├── run_ci.sh # CI build script
|
||||
└── README.txt # Human-readable README
|
||||
```
|
||||
|
||||
## Build Instructions
|
||||
|
||||
### Prerequisites
|
||||
|
||||
- CMake 3.20+
|
||||
- C++20 compatible compiler (GCC, Clang, MSVC)
|
||||
- Python 3 (for build scripts)
|
||||
- Ninja (recommended, used by build scripts)
|
||||
- OpenSSL 1.1+ development libraries
|
||||
- Platform-specific audio libraries
|
||||
|
||||
### Linux Build
|
||||
|
||||
```bash
|
||||
python3 build_linux.py
|
||||
```
|
||||
|
||||
This creates a `build_linux/` directory and outputs `librtphone.a`.
|
||||
|
||||
### Android Build
|
||||
|
||||
```bash
|
||||
# Ensure ANDROID_NDK_HOME environment variable is set
|
||||
export ANDROID_NDK_HOME=/path/to/android-ndk
|
||||
python3 build_android.py
|
||||
```
|
||||
|
||||
Or use the shell script:
|
||||
```bash
|
||||
./build_android.sh
|
||||
```
|
||||
|
||||
This creates a `build_android/` directory with ARM64 libraries by default.
|
||||
|
||||
### Manual CMake Build
|
||||
|
||||
```bash
|
||||
mkdir build && cd build
|
||||
cmake ../src -G Ninja
|
||||
cmake --build . -j$(nproc)
|
||||
```
|
||||
|
||||
### Build Options
|
||||
|
||||
The following CMake options are available (defined in `src/CMakeLists.txt`):
|
||||
|
||||
- `USE_AMR_CODEC` (ON/OFF): Include AMR-NB/AMR-WB codec support. Default: ON
|
||||
- `USE_EVS_CODEC` (ON/OFF): Include EVS codec support. Default: ON
|
||||
- `USE_MUSL` (ON/OFF): Build with MUSL library. Default: OFF
|
||||
|
||||
## Module Architecture
|
||||
|
||||
### 1. Agent Module (`src/engine/agent/`)
|
||||
|
||||
Provides a JSON-based command interface for controlling the engine.
|
||||
|
||||
**Key Classes:**
|
||||
- `AgentImpl`: Main agent implementation, processes JSON commands
|
||||
- `Agent_AudioManager`: Manages audio devices and streams
|
||||
|
||||
**Interface Pattern:**
|
||||
Commands are sent as JSON strings and responses are returned as JSON.
|
||||
|
||||
### 2. Endpoint Module (`src/engine/endpoint/`)
|
||||
|
||||
SIP user agent implementation based on reSIProcate.
|
||||
|
||||
**Key Classes:**
|
||||
- `UserAgent` (in EP_Engine.h): Main SIP stack wrapper, handles registration, sessions, presence
|
||||
- `Account` (EP_Account): SIP account management
|
||||
- `Session` (EP_Session): Call/session management
|
||||
- `EP_AudioProvider`: Audio data provider for sessions
|
||||
- `EP_DataProvider`: Generic data provider interface
|
||||
|
||||
**Key Concepts:**
|
||||
- Implements resiprocate handlers: `ClientRegistrationHandler`, `InviteSessionHandler`, etc.
|
||||
- Supports multiple transport types: UDP, TCP, TLS
|
||||
- ICE integration for NAT traversal
|
||||
|
||||
### 3. Media Module (`src/engine/media/`)
|
||||
|
||||
Audio codec management, RTP/RTCP handling, and media processing.
|
||||
|
||||
**Key Classes:**
|
||||
- `MT::AudioCodec`: Codec management
|
||||
- `MT::AudioStream`: Audio streaming
|
||||
- `MT::AudioReceiver`: RTP packet receiving
|
||||
- `MT::CodecList`: Codec negotiation
|
||||
- `MT::SrtpHelper`: SRTP encryption
|
||||
- `MT::Dtmf`: DTMF tone handling
|
||||
- `MT::AmrCodec`: AMR codec wrapper
|
||||
- `MT::EvsCodec`: EVS codec wrapper
|
||||
|
||||
### 4. Audio Module (`src/engine/audio/`)
|
||||
|
||||
Cross-platform audio I/O abstraction.
|
||||
|
||||
**Key Classes:**
|
||||
- `Audio::Interface`: Audio interface abstraction
|
||||
- `Audio::DevicePair`: Input/output device pair
|
||||
- `Audio::Resampler`: Audio resampling
|
||||
- `Audio::Mixer`: Multi-channel audio mixing
|
||||
- `Audio::CoreAudio`: macOS/iOS implementation
|
||||
- `Audio::DirectSound`: Windows DirectSound implementation
|
||||
- `Audio::AndroidOboe`: Android Oboe implementation
|
||||
- `Audio::Null`: Null/no-op implementation for testing
|
||||
|
||||
### 5. Helper Module (`src/engine/helper/`)
|
||||
|
||||
Utility classes and platform abstractions.
|
||||
|
||||
**Key Classes:**
|
||||
- `HL::Types`: Type definitions and BiMap template
|
||||
- `HL::Sync`: Threading primitives (Mutex, Event, etc.)
|
||||
- `HL::ByteBuffer`: Binary data buffer
|
||||
- `HL::VariantMap`: Key-value configuration storage
|
||||
- `HL::Rtp`: RTP packet utilities
|
||||
- `HL::IuUP`: Iu User Plane protocol (3G)
|
||||
- `HL::NetworkSocket`: Network socket abstraction
|
||||
- `HL::ThreadPool`: Thread pool implementation
|
||||
|
||||
## Code Style Guidelines
|
||||
|
||||
### Naming Conventions
|
||||
|
||||
1. **Classes**: PascalCase with module prefix
|
||||
- `AgentImpl`, `UserAgent`, `MT::AudioCodec`, `HL::Sync`
|
||||
|
||||
2. **Files**: Prefix indicates module
|
||||
- `Agent_*.cpp/h` - Agent module
|
||||
- `EP_*.cpp/h` - Endpoint module
|
||||
- `MT_*.cpp/h` - Media module
|
||||
- `Audio_*.cpp/h` - Audio module
|
||||
- `HL_*.cpp/h` - Helper module
|
||||
|
||||
3. **Member Variables**: Hungarian notation with `m` prefix
|
||||
- `mAgentMutex`, `mSessionMap`, `mShutdown`
|
||||
|
||||
4. **Type Aliases**: `P` prefix for smart pointers
|
||||
- `PAccount`, `PSession`, `PVariantMap`
|
||||
|
||||
### File Header Template
|
||||
|
||||
All source files must include the MPL license header:
|
||||
|
||||
```cpp
|
||||
/* Copyright(C) 2007-YYYY VoIP objects (voipobjects.com)
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
```
|
||||
|
||||
### Include Order
|
||||
|
||||
1. Corresponding header file (for .cpp files)
|
||||
2. Project headers (using `"..."`)
|
||||
3. Third-party library headers
|
||||
4. Standard library headers
|
||||
5. System headers
|
||||
|
||||
### Platform Abstraction
|
||||
|
||||
Use preprocessor defines for platform-specific code:
|
||||
- `TARGET_WIN` - Windows
|
||||
- `TARGET_LINUX` - Linux
|
||||
- `TARGET_OSX` - macOS
|
||||
- `TARGET_ANDROID` - Android
|
||||
- `TARGET_MUSL` - MUSL libc
|
||||
|
||||
## Configuration
|
||||
|
||||
### Compile-Time Configuration (`src/engine/engine_config.h`)
|
||||
|
||||
Key configuration constants:
|
||||
|
||||
```cpp
|
||||
// Audio settings
|
||||
#define AUDIO_SAMPLE_WIDTH 16
|
||||
#define AUDIO_CHANNELS 1
|
||||
#define AUDIO_SAMPLERATE 48000
|
||||
#define AUDIO_RESAMPLER_QUALITY 1
|
||||
|
||||
// SIP settings
|
||||
#define UA_REGISTRATION_TIME 3600
|
||||
#define UA_MEDIA_PORT_START 20000
|
||||
#define UA_MEDIA_PORT_FINISH 30000
|
||||
|
||||
// Codec payload types
|
||||
#define MT_AMRNB_PAYLOADTYPE 112
|
||||
#define MT_AMRWB_PAYLOADTYPE 96
|
||||
#define MT_EVS_PAYLOADTYPE 127
|
||||
#define MT_OPUS_CODEC_PT 106
|
||||
```
|
||||
|
||||
### Runtime Configuration
|
||||
|
||||
Configuration is passed via `VariantMap` objects to the UserAgent:
|
||||
|
||||
```cpp
|
||||
enum
|
||||
{
|
||||
CONFIG_IPV4 = 0, // Use IP4
|
||||
CONFIG_IPV6, // Use IP6
|
||||
CONFIG_USERNAME, // Username
|
||||
CONFIG_DOMAIN, // Domain
|
||||
CONFIG_PASSWORD, // Password
|
||||
CONFIG_STUNSERVER_NAME, // STUN server hostname
|
||||
CONFIG_STUNSERVER_PORT, // STUN server port
|
||||
CONFIG_TRANSPORT, // 0=all, 1=UDP, 2=TCP, 3=TLS
|
||||
// ... see EP_Engine.h for full list
|
||||
};
|
||||
```
|
||||
|
||||
## Dependencies
|
||||
|
||||
### Git Submodules
|
||||
|
||||
The project uses Git submodules for some dependencies:
|
||||
- `src/libs/resiprocate` - SIP stack (sevana branch)
|
||||
- `src/libs/libsrtp` - SRTP library
|
||||
- `src/libs/libraries` - Prebuilt platform libraries
|
||||
|
||||
To initialize:
|
||||
```bash
|
||||
git submodule update --init --recursive
|
||||
```
|
||||
|
||||
### Third-Party Libraries
|
||||
|
||||
Prebuilt libraries are provided in `src/libs/libraries/`:
|
||||
- OpenSSL 1.1 (crypto, SSL)
|
||||
- Opus codec
|
||||
- Opencore AMR (NB/WB)
|
||||
- Boost (headers)
|
||||
- PortAudio
|
||||
- libevent2
|
||||
|
||||
## Testing
|
||||
|
||||
There is no dedicated test suite in the main project. Testing is typically done through:
|
||||
|
||||
1. Integration with the final application
|
||||
2. The `run_ci.sh` script for build verification
|
||||
3. Unit tests in individual library submodules (e.g., oboe)
|
||||
|
||||
### CI Build
|
||||
|
||||
```bash
|
||||
./run_ci.sh
|
||||
```
|
||||
|
||||
This configures with CMake and builds with make (2 parallel jobs).
|
||||
|
||||
## Security Considerations
|
||||
|
||||
1. **OpenSSL Integration**: Uses OpenSSL 1.1+ for TLS and certificate handling
|
||||
2. **SRTP Support**: Media encryption via libsrtp
|
||||
3. **Certificate Management**: Root certificates can be added at runtime via `addRootCert()`
|
||||
4. **AMR/EVS Patents**: The project does NOT include patent licenses for AMR and EVS codecs. Users must acquire these independently.
|
||||
|
||||
## Integration Guide
|
||||
|
||||
### Basic Usage Pattern
|
||||
|
||||
1. Create `AgentImpl` instance
|
||||
2. Send JSON commands via `command()` method
|
||||
3. Poll for events via `waitForData()` and `read()`
|
||||
4. Process JSON event responses
|
||||
|
||||
### Example Commands
|
||||
|
||||
- `config` - Configure the engine
|
||||
- `start` - Start the engine
|
||||
- `createAccount` - Create SIP account
|
||||
- `startAccount` - Register account
|
||||
- `createSession` - Create call session
|
||||
- `startSession` - Make/accept call
|
||||
- `waitForEvent` - Poll for events
|
||||
|
||||
## Development Workflow
|
||||
|
||||
1. **Making Changes**: Edit files in appropriate `src/engine/<module>/` directory
|
||||
2. **Building**: Use `build_linux.py` for quick Linux builds
|
||||
3. **Testing**: Integrate with test application or use existing CI
|
||||
4. **Commits**: Follow existing commit message style (visible in git log)
|
||||
|
||||
## Common Tasks
|
||||
|
||||
### Adding a New Codec
|
||||
|
||||
1. Create `MT_<Codec>Codec.cpp/h` in `src/engine/media/`
|
||||
2. Derive from `MT::Codec` base class
|
||||
3. Register in `MT_CodecList.cpp`
|
||||
4. Add to `src/CMakeLists.txt` if external library needed
|
||||
|
||||
### Adding Platform Audio Support
|
||||
|
||||
1. Create `Audio_<Platform>.cpp/h` in `src/engine/audio/`
|
||||
2. Implement `Audio::Interface` methods
|
||||
3. Add platform detection in `src/CMakeLists.txt`
|
||||
4. Include in build conditionally
|
||||
|
||||
### Modifying Build Configuration
|
||||
|
||||
- Edit `src/CMakeLists.txt` for main build changes
|
||||
- Edit `src/libs/libraries/platform_libs.cmake` for platform library paths
|
||||
- Edit `src/engine/engine_config.h` for compile-time constants
|
||||
|
||||
## Notes
|
||||
|
||||
- The codebase uses C++20 features - ensure compiler compatibility
|
||||
- Thread safety: Use `std::recursive_mutex` (e.g., `mAgentMutex`) for thread-safe access
|
||||
- Memory management: Uses smart pointers (`std::shared_ptr`) extensively
|
||||
- The JSON library is embedded in `src/libs/json/`
|
||||
@@ -472,7 +472,10 @@ void AgentImpl::processWaitForEvent(JsonCpp::Value &request, JsonCpp::Value &ans
|
||||
//int x = 0;
|
||||
//int y = 1/x;
|
||||
|
||||
int timeout = request["timeout"].asInt();
|
||||
int timeout = 0;
|
||||
if (request.isMember("timeout"))
|
||||
timeout = request["timeout"].asInt();
|
||||
|
||||
std::unique_lock<std::mutex> eventLock(mEventListMutex);
|
||||
if (mEventList.empty())
|
||||
mEventListChangeCondVar.wait_for(eventLock, chrono::milliseconds(timeout));
|
||||
|
||||
@@ -54,7 +54,7 @@ namespace Audio
|
||||
std::string toString()
|
||||
{
|
||||
char buffer[64];
|
||||
sprintf(buffer, "%dHz %dch", mRate, mChannels);
|
||||
std::snprintf(buffer, sizeof(buffer), "%dHz %dch", mRate, mChannels);
|
||||
return std::string(buffer);
|
||||
}
|
||||
|
||||
|
||||
@@ -591,7 +591,7 @@ UserAgent::SipAddress UserAgent::parseSipAddress(const std::string& sip)
|
||||
if (nameaddr.uri().port())
|
||||
{
|
||||
char porttext[32];
|
||||
sprintf(porttext, ":%u", (unsigned)nameaddr.uri().port());
|
||||
std::snprintf(porttext, sizeof(porttext), ":%u", (unsigned)nameaddr.uri().port());
|
||||
result.mDomain += porttext;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ WatcherQueue::WatcherQueue(UserAgent& ua)
|
||||
WatcherQueue::~WatcherQueue()
|
||||
{}
|
||||
|
||||
int WatcherQueue::add(std::string peer, std::string package, void* tag)
|
||||
int WatcherQueue::add(const std::string& peer, const std::string& package, void* tag)
|
||||
{
|
||||
ice::Lock l(mGuard);
|
||||
|
||||
@@ -16,8 +16,7 @@ int WatcherQueue::add(std::string peer, std::string package, void* tag)
|
||||
for (unsigned i=0; i<mItemList.size(); i++)
|
||||
{
|
||||
Item& item = mItemList[i];
|
||||
if (item.mTarget == peer && item.mPackage == package &&
|
||||
item.mState != Item::State_Deleting)
|
||||
if (item.mTarget == peer && item.mPackage == package && item.mState != Item::State_Deleting)
|
||||
return item.mId;
|
||||
}
|
||||
|
||||
@@ -44,10 +43,9 @@ void WatcherQueue::remove(int id)
|
||||
ice::Lock l(mGuard);
|
||||
|
||||
// Check if queue has similar item
|
||||
for (unsigned i=0; i<mItemList.size(); i++)
|
||||
for (auto& item: mItemList)
|
||||
{
|
||||
Item& item = mItemList[i];
|
||||
if (item.mId == id && !id)
|
||||
if (item.mId == id && id)
|
||||
{
|
||||
if (item.mState != Item::State_Deleting)
|
||||
item.mState = Item::State_ScheduledToDelete;
|
||||
@@ -62,10 +60,9 @@ void WatcherQueue::refresh(int id)
|
||||
ice::Lock l(mGuard);
|
||||
|
||||
// Check if queue has similar item
|
||||
for (unsigned i=0; i<mItemList.size(); i++)
|
||||
for (auto& item: mItemList)
|
||||
{
|
||||
Item& item = mItemList[i];
|
||||
if (item.mId == id && !id)
|
||||
if (item.mId == id && id)
|
||||
{
|
||||
if (item.mState == Item::State_ScheduledToDelete || item.mState == Item::State_Active)
|
||||
item.mState = Item::State_ScheduledToRefresh;
|
||||
@@ -142,9 +139,9 @@ void WatcherQueue::onTerminated(int id, int code)
|
||||
{
|
||||
if (i->mSession)
|
||||
i->mSession->runTerminatedEvent(ResipSession::Type_Subscription, code, 0);
|
||||
mItemList.erase(i);
|
||||
if (i->mId == mActiveId)
|
||||
mActiveId = 0;
|
||||
mItemList.erase(i);
|
||||
}
|
||||
process();
|
||||
}
|
||||
|
||||
@@ -28,15 +28,14 @@ public:
|
||||
};
|
||||
|
||||
resip::ClientSubscriptionHandle mHandle; // Subscription handle
|
||||
ResipSession* mSession;
|
||||
State mState;
|
||||
ResipSession* mSession = nullptr;
|
||||
State mState = State::State_None;
|
||||
std::string mTarget; // Target's address
|
||||
std::string mPackage; // Event package
|
||||
void* mTag; // User tag
|
||||
int mId;
|
||||
void* mTag = nullptr; // User tag
|
||||
int mId = 0; // Related session ID - it is always non-zero (zero is here for initialization only)
|
||||
|
||||
Item()
|
||||
:mSession(NULL), mState(State_None), mTag(NULL), mId(0)
|
||||
{}
|
||||
|
||||
bool scheduled()
|
||||
@@ -47,7 +46,7 @@ public:
|
||||
WatcherQueue(UserAgent& agent);
|
||||
~WatcherQueue();
|
||||
|
||||
int add(std::string peer, std::string package, void* tag);
|
||||
int add(const std::string& peer, const std::string& package, void* tag);
|
||||
void remove(int id);
|
||||
void refresh(int id);
|
||||
void clear();
|
||||
|
||||
@@ -36,10 +36,10 @@ ResipSessionAppDialog::~ResipSessionAppDialog()
|
||||
std::atomic_int ResipSession::InstanceCounter;
|
||||
|
||||
ResipSession::ResipSession(resip::DialogUsageManager& dum)
|
||||
: resip::AppDialogSet(dum), mUserAgent(NULL), mType(Type_None), mSessionId(0), mSession(0)
|
||||
: resip::AppDialogSet(dum), mUserAgent(nullptr), mType(Type_None), mSessionId(0), mSession(0)
|
||||
{
|
||||
ResipSession::InstanceCounter++;
|
||||
mTag = NULL;
|
||||
mTag = nullptr;
|
||||
mTerminated = false;
|
||||
mOnWatchingStartSent = false;
|
||||
mSessionId = Session::generateId();
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#include <memory.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <cstdio>
|
||||
enum
|
||||
{
|
||||
ERR_MEDIA_SOCKET_FAILED = 1, // Failed to create media socket
|
||||
@@ -44,7 +44,7 @@ public:
|
||||
Exception(int code, int subcode = 0)
|
||||
:mCode(code), mSubcode(subcode)
|
||||
{
|
||||
sprintf(mMessage, "%d-%d", code, subcode);
|
||||
std::snprintf(mMessage, sizeof(mMessage), "%d-%d", code, subcode);
|
||||
}
|
||||
|
||||
Exception(int code, const char* message)
|
||||
@@ -78,8 +78,8 @@ public:
|
||||
}
|
||||
|
||||
protected:
|
||||
int mCode, mSubcode;
|
||||
char mMessage[256];
|
||||
int mCode = 0, mSubcode = 0;
|
||||
char mMessage[256] = {0};
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -69,19 +69,26 @@ unsigned DatagramSocket::recvDatagram(InternetAddress &src, void *packetBuffer,
|
||||
if (mHandle == INVALID_SOCKET)
|
||||
return 0;
|
||||
|
||||
sockaddr_in sourceaddr;
|
||||
#ifdef WIN32
|
||||
int addrlen = sizeof(sourceaddr);
|
||||
#else
|
||||
socklen_t addrlen = sizeof(sourceaddr);
|
||||
#endif
|
||||
int received = ::recvfrom(mHandle, (char*)packetBuffer, packetCapacity, 0, (sockaddr*)&sourceaddr, &addrlen);
|
||||
sockaddr* addr = nullptr;
|
||||
socklen_t addrLen = 0;
|
||||
sockaddr_in addr_4 = {AF_INET, 0, {0}, {0}};
|
||||
sockaddr_in6 addr_6 = {AF_INET6, 0, 0, {0}, 0};
|
||||
switch (mFamily)
|
||||
{
|
||||
case AF_INET: addr = (sockaddr*)&addr_4; addrLen = sizeof(addr_4); break;
|
||||
case AF_INET6: addr = (sockaddr*)&addr_6; addrLen = sizeof(addr_6); break;
|
||||
default:
|
||||
assert(0);
|
||||
}
|
||||
if (!addr || !addrLen)
|
||||
return 0;
|
||||
|
||||
int received = ::recvfrom(mHandle, (char*)packetBuffer, packetCapacity, 0, addr, &addrLen);
|
||||
if (received > 0)
|
||||
{
|
||||
src = InternetAddress((sockaddr&)sourceaddr, addrlen);
|
||||
src = InternetAddress((sockaddr&)*addr, addrLen);
|
||||
return received;
|
||||
}
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -176,12 +183,12 @@ PDatagramSocket DatagramAgreggator::socketAt(unsigned index)
|
||||
return mSocketVector[index];
|
||||
}
|
||||
|
||||
bool DatagramAgreggator::waitForData(unsigned milliseconds)
|
||||
bool DatagramAgreggator::waitForData(std::chrono::milliseconds timeout)
|
||||
{
|
||||
timeval tv;
|
||||
tv.tv_sec = milliseconds / 1000;
|
||||
tv.tv_usec = (milliseconds % 1000) * 1000;
|
||||
tv.tv_sec = timeout.count() / 1000;
|
||||
tv.tv_usec = (timeout.count() % 1000) * 1000;
|
||||
|
||||
int rescode = ::select(mMaxHandle, &mReadSet, NULL, NULL, &tv);
|
||||
int rescode = ::select(mMaxHandle+1, &mReadSet, nullptr, nullptr, &tv);
|
||||
return rescode > 0;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* Copyright(C) 2007-2014 VoIP objects (voipobjects.com)
|
||||
/* Copyright(C) 2007-2026 VoIP objects (voipobjects.com)
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "HL_InternetAddress.h"
|
||||
#include <vector>
|
||||
#include <memory>
|
||||
#include <chrono>
|
||||
|
||||
class NetworkSocket
|
||||
{
|
||||
@@ -56,7 +57,7 @@ public:
|
||||
bool hasDataAtIndex(unsigned index);
|
||||
PDatagramSocket socketAt(unsigned index);
|
||||
|
||||
bool waitForData(unsigned milliseconds);
|
||||
bool waitForData(std::chrono::milliseconds timeout);
|
||||
|
||||
protected:
|
||||
typedef std::vector<PDatagramSocket> SocketList;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
#endif
|
||||
#include <set>
|
||||
#include <assert.h>
|
||||
|
||||
#include <chrono>
|
||||
#if !defined(TARGET_WIN)
|
||||
# include <unistd.h> // Responsible for close() call on Linux
|
||||
#endif
|
||||
@@ -28,6 +28,7 @@
|
||||
#define WSAEADDRINUSE EADDRINUSE
|
||||
#endif
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
// ----------------------------- SocketSink -------------------------
|
||||
SocketSink::~SocketSink()
|
||||
@@ -253,7 +254,7 @@ void SocketHeap::thread()
|
||||
// If set is not empty
|
||||
if (agreggator.count() > 0)
|
||||
{
|
||||
if (agreggator.waitForData(10))
|
||||
if (agreggator.waitForData(10ms))
|
||||
{
|
||||
ICELogMedia(<< "There is data on UDP sockets");
|
||||
Lock l(mGuard);
|
||||
|
||||
@@ -113,7 +113,7 @@ uint64_t strx::toUint64(const char* s, uint64_t def, bool *isOk)
|
||||
std::string strx::toHex(unsigned int value)
|
||||
{
|
||||
char buffer[32];
|
||||
sprintf(buffer, "%x", value);
|
||||
std::snprintf(buffer, sizeof(buffer), "%x", value);
|
||||
return buffer;
|
||||
}
|
||||
|
||||
@@ -252,7 +252,7 @@ std::pair<std::string, std::string> strx::parseAssignment(const std::string& s,
|
||||
std::string strx::intToString(int value)
|
||||
{
|
||||
char buffer[32];
|
||||
sprintf(buffer, "%d", value);
|
||||
std::snprintf(buffer, sizeof(buffer), "%d", value);
|
||||
return buffer;
|
||||
}
|
||||
|
||||
@@ -304,7 +304,10 @@ std::string strx::millisecondsToString(uint64_t t)
|
||||
int strx::fromHex2Int(const std::string &s)
|
||||
{
|
||||
int result = 0;
|
||||
sscanf(s.c_str(), "%x", &result);
|
||||
int retcode = sscanf(s.c_str(), "%x", &result);
|
||||
if (retcode == 0)
|
||||
return 0;
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -338,7 +341,7 @@ std::string strx::replace(const std::string& s, char f, char r)
|
||||
{
|
||||
std::string result(s);
|
||||
for (std::string::size_type i = 0; i < result.size(); i++)
|
||||
if (result[i] == 'f')
|
||||
if (result[i] == f)
|
||||
result[i] = r;
|
||||
|
||||
return result;
|
||||
|
||||
@@ -32,24 +32,12 @@ void SyncHelper::delay(unsigned int microseconds)
|
||||
#endif
|
||||
}
|
||||
|
||||
long SyncHelper::increment(long *value)
|
||||
{
|
||||
assert(value);
|
||||
#ifdef TARGET_WIN
|
||||
return ::InterlockedIncrement((LONG*)value);
|
||||
#elif TARGET_OSX
|
||||
return OSAtomicIncrement32((int32_t*)value);
|
||||
#elif TARGET_LINUX
|
||||
return -1;
|
||||
#else
|
||||
return -1;
|
||||
#endif
|
||||
}
|
||||
|
||||
// ------------------- ThreadHelper -------------------
|
||||
void ThreadHelper::setName(const std::string &name)
|
||||
{
|
||||
#if defined(TARGET_LINUX)
|
||||
// The name will be truncated to 8 or 16 characters
|
||||
int retcode = pthread_setname_np(pthread_self(), name.c_str());
|
||||
if (retcode != 0)
|
||||
{
|
||||
@@ -128,7 +116,7 @@ uint64_t chronox::toTimestamp(const timeval& ts)
|
||||
int64_t chronox::getDelta(const timespec& a, const timespec& b)
|
||||
{
|
||||
uint64_t ms_a = a.tv_sec * 1000 + a.tv_nsec / 10000000;
|
||||
uint64_t ms_b = b.tv_sec * 1000 + a.tv_nsec / 10000000;
|
||||
uint64_t ms_b = b.tv_sec * 1000 + b.tv_nsec / 10000000;
|
||||
return ms_a - ms_b;
|
||||
}
|
||||
|
||||
@@ -208,10 +196,10 @@ void Semaphore::wait()
|
||||
m_count--;
|
||||
}
|
||||
|
||||
bool Semaphore::waitFor(int milliseconds) {
|
||||
bool Semaphore::waitFor(std::chrono::milliseconds timeout) {
|
||||
std::unique_lock<std::mutex> lock(m_mtx);
|
||||
|
||||
if (!m_cv.wait_for(lock, std::chrono::milliseconds(milliseconds), [this]() { return m_count > 0; }))
|
||||
if (!m_cv.wait_for(lock, timeout, [this]() { return m_count > 0; }))
|
||||
return false;
|
||||
|
||||
m_count--;
|
||||
@@ -317,11 +305,8 @@ void TimerQueue::run()
|
||||
auto end = calcWaitTime();
|
||||
if (end.first)
|
||||
{
|
||||
// Timers found, so wait until it expires (or something else
|
||||
// changes)
|
||||
int milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>
|
||||
(end.second - std::chrono::steady_clock::now()).count();
|
||||
//std::cout << "Waiting m_checkWork for " << milliseconds * 1000 << "ms." << std::endl;
|
||||
// Timers found, so wait until it expires (or something else changes)
|
||||
auto milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>(end.second - std::chrono::steady_clock::now());
|
||||
m_checkWork.waitFor(milliseconds);
|
||||
} else {
|
||||
// No timers exist, so wait forever until something changes
|
||||
|
||||
@@ -26,7 +26,6 @@ class SyncHelper
|
||||
{
|
||||
public:
|
||||
static void delay(unsigned microseconds);
|
||||
static long increment(long* value);
|
||||
};
|
||||
|
||||
class Semaphore
|
||||
@@ -36,7 +35,7 @@ public:
|
||||
|
||||
void notify();
|
||||
void wait();
|
||||
bool waitFor(int milliseconds);
|
||||
bool waitFor(std::chrono::milliseconds timeout);
|
||||
|
||||
private:
|
||||
std::mutex m_mtx;
|
||||
|
||||
@@ -59,8 +59,11 @@ void thread_pool::run_worker()
|
||||
std::unique_lock<std::mutex> lock(this->queue_mutex);
|
||||
|
||||
this->condition.wait(lock, [this]{return !this->tasks.empty() || this->stop;});
|
||||
t = this->tasks.front();
|
||||
this->tasks.pop();
|
||||
if (!tasks.empty())
|
||||
{
|
||||
t = tasks.front();
|
||||
tasks.pop();
|
||||
}
|
||||
}
|
||||
t(); // function<void()> type
|
||||
}
|
||||
|
||||
@@ -299,18 +299,18 @@ std::string Variant::asStdString() const
|
||||
return mString;
|
||||
|
||||
case VTYPE_INT:
|
||||
sprintf(buffer, "%d", mInt);
|
||||
std::snprintf(buffer, sizeof(buffer), "%d", mInt);
|
||||
return buffer;
|
||||
|
||||
case VTYPE_INT64:
|
||||
sprintf(buffer, "%lli", static_cast<long long int>(mInt64));
|
||||
std::snprintf(buffer, sizeof(buffer), "%lli", static_cast<long long int>(mInt64));
|
||||
return buffer;
|
||||
|
||||
case VTYPE_BOOL:
|
||||
return mBool ? "true" : "false";
|
||||
|
||||
case VTYPE_FLOAT:
|
||||
sprintf(buffer, "%f", mFloat);
|
||||
std::snprintf(buffer, sizeof(buffer), "%f", mFloat);
|
||||
return buffer;
|
||||
|
||||
default:
|
||||
|
||||
@@ -313,10 +313,10 @@ int AmrNbCodec::encode(const void* input, int inputBytes, void* output, int outp
|
||||
return 0;
|
||||
|
||||
// Declare the data input pointer
|
||||
const short *dataIn = (const short *)input;
|
||||
auto *dataIn = (const short *)input;
|
||||
|
||||
// Declare the data output pointer
|
||||
unsigned char *dataOut = (unsigned char *)output;
|
||||
auto *dataOut = (unsigned char *)output;
|
||||
|
||||
// Find how much RTP frames will be generated
|
||||
unsigned int frames = inputBytes / pcmLength();
|
||||
@@ -328,7 +328,7 @@ int AmrNbCodec::encode(const void* input, int inputBytes, void* output, int outp
|
||||
dataIn += pcmLength() / 2;
|
||||
}
|
||||
|
||||
return frames * rtpLength();
|
||||
return dataOut - (unsigned char*)output;
|
||||
}
|
||||
|
||||
#define L_FRAME 160
|
||||
|
||||
Reference in New Issue
Block a user