aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/QXmppLogger.cpp27
-rw-r--r--src/QXmppLogger.h48
-rw-r--r--src/QXmppRtpChannel.cpp44
-rw-r--r--src/QXmppRtpChannel.h20
-rw-r--r--src/QXmppStream.cpp4
-rw-r--r--src/QXmppStun.cpp11
6 files changed, 86 insertions, 68 deletions
diff --git a/src/QXmppLogger.cpp b/src/QXmppLogger.cpp
index 6098aa2b..2beb0bbe 100644
--- a/src/QXmppLogger.cpp
+++ b/src/QXmppLogger.cpp
@@ -88,33 +88,6 @@ void QXmppLoggable::childEvent(QChildEvent *event)
}
}
-/// Logs a debugging message.
-///
-/// \param message
-
-void QXmppLoggable::debug(const QString &message)
-{
- emit logMessage(QXmppLogger::DebugMessage, message);
-}
-
-/// Logs an informational message.
-///
-/// \param message
-
-void QXmppLoggable::info(const QString &message)
-{
- emit logMessage(QXmppLogger::InformationMessage, message);
-}
-
-/// Logs a warning message.
-///
-/// \param message
-
-void QXmppLoggable::warning(const QString &message)
-{
- emit logMessage(QXmppLogger::WarningMessage, message);
-}
-
/// Constructs a new QXmppLogger.
///
/// \param parent
diff --git a/src/QXmppLogger.h b/src/QXmppLogger.h
index 1a90238a..d58a528f 100644
--- a/src/QXmppLogger.h
+++ b/src/QXmppLogger.h
@@ -104,9 +104,51 @@ public:
protected:
virtual void childEvent(QChildEvent *event);
- void debug(const QString &msg);
- void info(const QString &msg);
- void warning(const QString &msg);
+
+ /// Logs a debugging message.
+ ///
+ /// \param message
+
+ void debug(const QString &message)
+ {
+ emit logMessage(QXmppLogger::DebugMessage, message);
+ }
+
+ /// Logs an informational message.
+ ///
+ /// \param message
+
+ void info(const QString &message)
+ {
+ emit logMessage(QXmppLogger::InformationMessage, message);
+ }
+
+ /// Logs a warning message.
+ ///
+ /// \param message
+
+ void warning(const QString &message)
+ {
+ emit logMessage(QXmppLogger::WarningMessage, message);
+ }
+
+ /// Logs a received packet.
+ ///
+ /// \param msg
+
+ void logReceived(const QString &message)
+ {
+ emit logMessage(QXmppLogger::ReceivedMessage, message);
+ }
+
+ /// Logs a sent packet.
+ ///
+ /// \param msg
+
+ void logSent(const QString &message)
+ {
+ emit logMessage(QXmppLogger::SentMessage, message);
+ }
signals:
/// This signal is emitted to send logging messages.
diff --git a/src/QXmppRtpChannel.cpp b/src/QXmppRtpChannel.cpp
index 94cebce6..43e58ff8 100644
--- a/src/QXmppRtpChannel.cpp
+++ b/src/QXmppRtpChannel.cpp
@@ -113,15 +113,13 @@ void QXmppRtpChannel::datagramReceived(const QByteArray &ba)
{
if (!d->codec)
{
- emit logMessage(QXmppLogger::WarningMessage,
- QLatin1String("QXmppRtpChannel::datagramReceived before codec selection"));
+ warning("QXmppRtpChannel::datagramReceived before codec selection");
return;
}
if (ba.size() < 12 || (quint8(ba.at(0)) >> 6) != RTP_VERSION)
{
- emit logMessage(QXmppLogger::WarningMessage,
- QLatin1String("QXmppRtpChannel::datagramReceived got an invalid RTP packet"));
+ warning("QXmppRtpChannel::datagramReceived got an invalid RTP packet");
return;
}
@@ -141,8 +139,7 @@ void QXmppRtpChannel::datagramReceived(const QByteArray &ba)
const qint64 packetLength = ba.size() - 12;
#ifdef QXMPP_DEBUG_RTP
- emit logMessage(QXmppLogger::ReceivedMessage,
- QString("RTP packet seq %1 stamp %2 marker %3 type %4 size %5").arg(
+ logReceived(QString("RTP packet seq %1 stamp %2 marker %3 type %4 size %5").arg(
QString::number(sequence),
QString::number(stamp),
QString::number(marker),
@@ -153,8 +150,7 @@ void QXmppRtpChannel::datagramReceived(const QByteArray &ba)
// check type
if (type != d->payloadType.id())
{
- emit logMessage(QXmppLogger::WarningMessage,
- QString("RTP packet seq %1 has unknown type %2")
+ warning(QString("RTP packet seq %1 has unknown type %2")
.arg(QString::number(sequence))
.arg(QString::number(type)));
return;
@@ -162,8 +158,7 @@ void QXmppRtpChannel::datagramReceived(const QByteArray &ba)
// check sequence number
if (!marker && sequence != d->incomingSequence + 1)
- emit logMessage(QXmppLogger::WarningMessage,
- QString("RTP packet seq %1 is out of order, previous was %2")
+ warning(QString("RTP packet seq %1 is out of order, previous was %2")
.arg(QString::number(sequence))
.arg(QString::number(d->incomingSequence)));
d->incomingSequence = sequence;
@@ -175,8 +170,7 @@ void QXmppRtpChannel::datagramReceived(const QByteArray &ba)
packetOffset = (stamp - d->incomingStamp) * SAMPLE_BYTES;
if (packetOffset < 0)
{
- emit logMessage(QXmppLogger::WarningMessage,
- QString("RTP packet stamp %1 is too old, buffer start is %2")
+ warning(QString("RTP packet stamp %1 is too old, buffer start is %2")
.arg(QString::number(stamp))
.arg(QString::number(d->incomingStamp)));
return;
@@ -197,8 +191,7 @@ void QXmppRtpChannel::datagramReceived(const QByteArray &ba)
if (d->incomingBuffer.size() > d->incomingMaximum)
{
const qint64 droppedSize = d->incomingBuffer.size() - d->incomingMinimum;
- emit logMessage(QXmppLogger::DebugMessage,
- QString("RTP buffer is too full, dropping %1 bytes")
+ debug(QString("RTP buffer is too full, dropping %1 bytes")
.arg(QString::number(droppedSize)));
d->incomingBuffer = d->incomingBuffer.right(d->incomingMinimum);
d->incomingStamp += droppedSize / SAMPLE_BYTES;
@@ -239,8 +232,7 @@ qint64 QXmppRtpChannel::readData(char * data, qint64 maxSize)
d->incomingBuffer.remove(0, readSize);
if (readSize < maxSize)
{
- emit logMessage(QXmppLogger::InformationMessage,
- QString("QXmppRtpChannel::readData missing %1 bytes").arg(QString::number(maxSize - readSize)));
+ debug(QString("QXmppRtpChannel::readData missing %1 bytes").arg(QString::number(maxSize - readSize)));
memset(data + readSize, 0, maxSize - readSize);
}
d->incomingStamp += readSize / SAMPLE_BYTES;
@@ -274,8 +266,7 @@ void QXmppRtpChannel::setPayloadType(const QXmppJinglePayloadType &payloadType)
#endif
else
{
- emit logMessage(QXmppLogger::WarningMessage,
- QString("QXmppCall got an unknown codec : %1 (%2)")
+ warning(QString("QXmppCall got an unknown codec : %1 (%2)")
.arg(QString::number(payloadType.id()))
.arg(payloadType.name()));
return;
@@ -332,8 +323,7 @@ qint64 QXmppRtpChannel::writeData(const char * data, qint64 maxSize)
{
if (!d->codec)
{
- emit logMessage(QXmppLogger::WarningMessage,
- QLatin1String("QXmppRtpChannel::writeData before codec was set"));
+ warning("QXmppRtpChannel::writeData before codec was set");
return -1;
}
@@ -360,15 +350,13 @@ qint64 QXmppRtpChannel::writeData(const char * data, qint64 maxSize)
input.setByteOrder(QDataStream::LittleEndian);
d->outgoingStamp += d->codec->encode(input, stream);
- // FIXME: write data
#ifdef QXMPP_DEBUG_RTP
- emit logMessage(QXmppLogger::SentMessage,
- QString("RTP packet seq %1 stamp %2 marker %3 type %4 size %5").arg(
- QString::number(d->outgoingSequence),
- QString::number(d->outgoingStamp),
- QString::number(marker_type & 0x80 != 0),
- QString::number(marker_type & 0x7f),
- QString::number(header.size() - 12)));
+ logSent(QString("RTP packet seq %1 stamp %2 marker %3 type %4 size %5").arg(
+ QString::number(d->outgoingSequence),
+ QString::number(d->outgoingStamp),
+ QString::number(marker_type & 0x80 != 0),
+ QString::number(marker_type & 0x7f),
+ QString::number(header.size() - 12)));
#endif
emit sendDatagram(header);
diff --git a/src/QXmppRtpChannel.h b/src/QXmppRtpChannel.h
index 877ad797..787e3b22 100644
--- a/src/QXmppRtpChannel.h
+++ b/src/QXmppRtpChannel.h
@@ -79,6 +79,26 @@ public slots:
void datagramReceived(const QByteArray &ba);
protected:
+ void debug(const QString &message)
+ {
+ emit logMessage(QXmppLogger::DebugMessage, message);
+ }
+
+ void warning(const QString &message)
+ {
+ emit logMessage(QXmppLogger::WarningMessage, message);
+ }
+
+ void logReceived(const QString &message)
+ {
+ emit logMessage(QXmppLogger::ReceivedMessage, message);
+ }
+
+ void logSent(const QString &message)
+ {
+ emit logMessage(QXmppLogger::SentMessage, message);
+ }
+
/// \cond
qint64 readData(char * data, qint64 maxSize);
qint64 writeData(const char * data, qint64 maxSize);
diff --git a/src/QXmppStream.cpp b/src/QXmppStream.cpp
index ea90e7db..848dc245 100644
--- a/src/QXmppStream.cpp
+++ b/src/QXmppStream.cpp
@@ -113,7 +113,7 @@ bool QXmppStream::isConnected() const
bool QXmppStream::sendData(const QByteArray &data)
{
- emit logMessage(QXmppLogger::SentMessage, QString::fromUtf8(data));
+ logSent(QString::fromUtf8(data));
if (!d->socket || d->socket->state() != QAbstractSocket::ConnectedState)
return false;
return d->socket->write(data) == data.size();
@@ -243,7 +243,7 @@ void QXmppStream::socketReadyRead()
return;
// remove data from buffer
- emit logMessage(QXmppLogger::ReceivedMessage, strData);
+ logReceived(strData);
d->dataBuffer.clear();
// process stream start
diff --git a/src/QXmppStun.cpp b/src/QXmppStun.cpp
index 276cbcba..7e6cab73 100644
--- a/src/QXmppStun.cpp
+++ b/src/QXmppStun.cpp
@@ -821,8 +821,7 @@ void QXmppStunSocket::checkCandidates()
msg.setType(Binding | Request);
msg.setId(m_stunId);
#ifdef QXMPP_DEBUG_STUN
- emit logMessage(QXmppLogger::SentMessage,
- QString("Sent to %1 %2\n%3").arg(m_stunHost.toString(),
+ logSent(QString("Sent to %1 %2\n%3").arg(m_stunHost.toString(),
QString::number(m_stunPort), msg.toString()));
#endif
socket->writeDatagram(msg.encode(), m_stunHost, m_stunPort);
@@ -999,7 +998,7 @@ void QXmppStunSocket::readyRead()
return;
}
#ifdef QXMPP_DEBUG_STUN
- emit logMessage(QXmppLogger::ReceivedMessage, QString("Received from %1 port %2\n%3").arg(remoteHost.toString(),
+ logReceived(QString("Received from %1 port %2\n%3").arg(remoteHost.toString(),
QString::number(remotePort),
message.toString()));
#endif
@@ -1148,11 +1147,7 @@ qint64 QXmppStunSocket::writeStun(const QXmppStunMessage &message, QXmppStunSock
const QString messagePassword = (message.type() & 0xFF00) ? m_localPassword : m_remotePassword;
qint64 ret = pair->socket->writeDatagram(message.encode(messagePassword), pair->remote.host(), pair->remote.port());
#ifdef QXMPP_DEBUG_STUN
- if (ret < 0)
- warning(QString("Could not send to %1\n%2").arg(pair->toString(), pair->socket->errorString()));
- else
- emit logMessage(QXmppLogger::SentMessage, QString("Sent to %1\n%2").arg(pair->toString(),
- message.toString()));
+ logSent(QString("Sent to %1\n%2").arg(pair->toString(), message.toString()));
#endif
return ret;
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-05-18 18:32:19 +0000