From a73415e5bfb186878a0632223e7d2c191dd3ab04 Mon Sep 17 00:00:00 2001 From: "Hajo.Thelen" Date: Wed, 4 Dec 2024 14:24:28 +0100 Subject: [PATCH 1/6] corrected the usage of SLF4J Logger and some other cosmetic --- .../org/mjsip/sip/provider/SipProvider.java | 63 ++++++++++--------- .../src/main/java/org/mjsip/ua/UserAgent.java | 46 ++++++-------- 2 files changed, 52 insertions(+), 57 deletions(-) diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/provider/SipProvider.java b/mjsip-sip/src/main/java/org/mjsip/sip/provider/SipProvider.java index b1b9490..95e6c45 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/provider/SipProvider.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/provider/SipProvider.java @@ -163,8 +163,8 @@ public SipProvider(SipOptions sipConfig, Scheduler scheduler) { /** Inits logs. */ private void initLog() { - LOG.info("SipStack: " + SipStack.release); - LOG.info("SipProvider: " + toString()); + LOG.info("SipStack: {}", SipStack.release); + LOG.info("SipProvider: {}", toString()); } /** @@ -188,13 +188,19 @@ public SipMessageFactory messageFactory() { return _sipMessageFactory; } - /** Whether the given transport protocol is secure (TLS or DTLS) or not (UDP, TCP, SCTP, etc.). - * @return true for TLS or DTLS, false otherwise */ + /** + * Whether the given transport protocol is secure (TLS or DTLS) or not (UDP, + * TCP, SCTP, etc.). + * + * @return true for TLS or DTLS, false otherwise + */ public static boolean isSecureTransport(String proto) { return proto.equalsIgnoreCase(PROTO_TLS) || proto.equalsIgnoreCase(PROTO_DTLS); } - /** Inits and starts the transport services. */ + /** + * Inits and starts the transport services. + */ private void initSipTrasport(String[] transport_protocols, int[] transport_ports) { if (transport_protocols.length > 0) { default_transport = transport_protocols[0]; @@ -266,7 +272,7 @@ private void initSipTrasport(String[] transport_protocols, int[] transport_ports } } catch (Exception e) { - LOG.warn("Exception. " + e); + LOG.warn("Exception while initialiing sip tranport.", e); } } // LOG.debug("transport is up"); @@ -279,7 +285,7 @@ private void stopSipTrasport() { for (Enumeration e = sip_transports.keys(); e.hasMoreElements();) { String proto = e.nextElement(); SipTransport transp = sip_transports.get(proto); - LOG.trace(proto + " is going down"); + LOG.trace("{} is going down", proto); transp.halt(); } sip_transports.clear(); @@ -295,7 +301,7 @@ public void setTransport(SipTransport transport) { sip_transports.put(proto,transport); transport.setListener(this); if (default_transport==null) default_transport=proto; - LOG.info(proto + " is up at port " + transport.getLocalPort()); + LOG.info("{} is up at port {}", proto, transport.getLocalPort()); } @@ -306,7 +312,7 @@ public void removeSipTransport(String proto) { sip_transports.remove(proto); t.halt(); if (proto.equals(default_transport)) default_transport=null; - LOG.info(proto + " is down"); + LOG.info("{} is down", proto); } } @@ -519,7 +525,7 @@ public int getNMaxConnections() { * Use MethodId.ANY to capture all messages. * @param listener is the SipProviderListener that the specified type of messages has to be passed to. */ public synchronized void addSelectiveListener(SipId id, SipProviderListener listener) { - LOG.debug("Adding SipProviderListener: " + id); + LOG.debug("Adding SipProviderListener: {}", id); sip_listeners.put(id,listener); } @@ -527,7 +533,7 @@ public synchronized void addSelectiveListener(SipId id, SipProviderListener list /** Removes a SipProviderListener. * @param id specifies the messages that the listener was associated to. */ public synchronized void removeSelectiveListener(SipId id) { - LOG.debug("Removing SipProviderListener: " + id); + LOG.debug("Removing SipProviderListener: {}", id); sip_listeners.remove(id); } @@ -602,7 +608,7 @@ public synchronized void removeExceptionListener(SipProviderExceptionListener li public ConnectionId sendMessage(SipMessage msg) { ConnectionId conn_id=msg.getConnectionId(); if (conn_id!=null) { - LOG.debug("trying to send message through connection " + conn_id); + LOG.debug("trying to send message through connection {}", conn_id); SipTransport sip_transport = sip_transports.get(conn_id.getProtocol()); if (sip_transport!=null) @@ -614,10 +620,10 @@ public ConnectionId sendMessage(SipMessage msg) { return conn_id; } catch (IOException e) { - LOG.warn("failed when tried to send message through connection " + conn_id, e); + LOG.warn("failed when tried to send message through connection {}", conn_id, e); } else { - LOG.warn("no support for protocol " + conn_id.getProtocol()); + LOG.warn("no support for protocol {}", conn_id.getProtocol()); } } // else @@ -686,7 +692,7 @@ public ConnectionId sendMessage(SipMessage msg) { // update the via according to transport information updateViaHeader(msg, transport, getViaAddress(SipURI.isIPv6(dest_addr)), getPort(), maddr, ttl); - LOG.debug("using transport " + transport); + LOG.debug("using transport {}", transport); } else { // RESPONSES @@ -825,7 +831,7 @@ private ConnectionId sendRawMessage(SipMessage msg, String proto, IpAddress dest // else SipTransport sip_transport = sip_transports.get(proto.toLowerCase()); if (sip_transport==null) { - LOG.warn("Unsupported protocol " + proto + ", message discarded."); + LOG.warn("Unsupported protocol {}, message discarded.", proto); return null; } // else @@ -946,7 +952,7 @@ private synchronized SipProviderListener getListener(SipMessage msg) { SipId transactionKey = SipId.createTransactionId(!msg.isRequest(), msg); SipProviderListener transactionListener = sip_listeners.get(transactionKey); if (transactionListener != null) { - LOG.debug("Message passed to transaction: " + transactionKey); + LOG.debug("Message passed to transaction: {}", transactionKey); return transactionListener; } @@ -954,7 +960,7 @@ private synchronized SipProviderListener getListener(SipMessage msg) { SipId dialogKey = SipId.createDialogId(msg); SipProviderListener dialogListener = sip_listeners.get(dialogKey); if (dialogListener != null) { - LOG.debug("Message passed to dialog: " + dialogKey); + LOG.debug("Message passed to dialog: {}", dialogKey); return dialogListener; } @@ -962,29 +968,28 @@ private synchronized SipProviderListener getListener(SipMessage msg) { SipId methodKey = SipId.createMethodId(msg); SipProviderListener methodListener = sip_listeners.get(methodKey); if (methodListener != null) { - LOG.debug("Message passed to method: " + methodKey); + LOG.debug("Message passed to method: {}", methodKey); return methodListener; } // try to look for a default UA SipProviderListener anyListener = sip_listeners.get(SipId.ANY_METHOD); if (anyListener != null) { - LOG.debug("Message passed to ua: " + SipId.ANY_METHOD); + LOG.debug("Message passed to ua: {}", SipId.ANY_METHOD); return anyListener; } - LOG.warn("No listener found for message: " + msg.getFirstLine()); + LOG.warn("No listener found for message: {}", msg.getFirstLine()); return null; } /** From SipTransportListener. When SipTransport terminates. */ @Override public void onTransportTerminated(SipTransport transport, Exception error) { - LOG.debug("transport " + transport + " terminated"); + LOG.debug("transport {} terminated", transport); // TRY TO RESTART UDP WHEN ERRORS OCCUR if (error!=null && transport.getProtocol().equals(PROTO_UDP)) { - LOG.info( - "transport UDP terminated with error: trying to restart it (after 1000ms).."); + LOG.info("transport UDP terminated with error: trying to restart it (after 1000ms).."); try { Thread.sleep(1000); } catch (Exception e) { @@ -1004,16 +1009,14 @@ public void onTransportTerminated(SipTransport transport, Exception error) { /** When a new incoming transport connection is established. It is called only for CO transport portocols. */ @Override public void onIncomingTransportConnection(SipTransport transport, SocketAddress remote_soaddr) { - LOG.debug("incoming connection established with " + transport + ":" - + remote_soaddr); + LOG.debug("incoming connection established with {}:{}", transport, remote_soaddr); } /** When a transport connection terminates. */ @Override public void onTransportConnectionTerminated(SipTransport transport, SocketAddress remote_soaddr, Exception error) { - LOG.debug("connection to " + transport + ":" + remote_soaddr - + " terminated"); + LOG.debug("connection to {}:{} terminated", transport, remote_soaddr); } @@ -1177,8 +1180,8 @@ private String toStringTransportProtocols() { /** Adds the SIP message to the message log. */ private final void logMessage(String message, String proto, String addr, int port, SipMessage msg) { if (_sipConfig.isLogAllPackets()) { - LOG.info(message + addr + ":" + port + "/" + proto + " (" + msg.getLength() + " bytes).\n" - + MESSAGE_BEGIN_DELIMITER + msg + MESSAGE_END_DELIMITER); + LOG.info("{} {}:{}/{} ({} bytes)\n{} {} {}", message, addr, port, proto, msg.getLength(), + MESSAGE_BEGIN_DELIMITER, msg, MESSAGE_END_DELIMITER); } } diff --git a/mjsip-ua/src/main/java/org/mjsip/ua/UserAgent.java b/mjsip-ua/src/main/java/org/mjsip/ua/UserAgent.java index ee61ee8..38be22e 100644 --- a/mjsip-ua/src/main/java/org/mjsip/ua/UserAgent.java +++ b/mjsip-ua/src/main/java/org/mjsip/ua/UserAgent.java @@ -289,13 +289,13 @@ protected void startMediaSessions() { if (LOG.isDebugEnabled()) { for (MediaDescriptor desc : localMedia) { - LOG.debug("Local media: " + desc); + LOG.debug("Local media: {}", desc); } for (MediaDescriptor desc : remoteMedia) { - LOG.debug("Remote media: " + desc); + LOG.debug("Remote media: {}", desc); } for (MediaDescriptor desc : matchingMedia) { - LOG.debug("Matching media: " + desc); + LOG.debug("Matching media: {}", desc); } } @@ -322,13 +322,11 @@ protected void startMediaSessions() { existing.halt(); } - if (LOG.isDebugEnabled()) { - LOG.debug("Starting media session: " + flow_spec); - } + LOG.debug("Starting media session: {}", flow_spec); MediaStreamer streamer = _mediaAgent.startMediaSession(sip_provider.scheduler(), flow_spec); if (streamer == null) { - LOG.warn("No media streamer found for type: " + mediaType); + LOG.warn("No media streamer found for type: {}", mediaType); continue; } @@ -347,7 +345,7 @@ private FlowSpec buildFlowSpec(String mediaType, MediaDescriptor remoteDescripto String transport=mediaField.getTransport(); List formatList = mediaField.getFormatList(); if (formatList.isEmpty()) { - LOG.warn("No matching formats found to establish flow: " + remoteDescriptor); + LOG.warn("No matching formats found to establish flow: {}", remoteDescriptor); return null; } @@ -361,7 +359,7 @@ private FlowSpec buildFlowSpec(String mediaType, MediaDescriptor remoteDescripto if (local_port!=0 && remote_port!=0 && media_spec!=null) { return new FlowSpec(mediaType,media_spec,local_port,remote_address,remote_port, dir); } else { - LOG.warn("No matching media found (local_port="+local_port+", remote_port="+remote_port+", remoteDescriptor="+remoteDescriptor+")."); + LOG.warn("No matching media found (local_port={}, remote_port={}, remoteDescriptor={}).", local_port, remote_port, remoteDescriptor); return null; } } @@ -421,14 +419,12 @@ public void onReceivedMessage(SipProvider sip_provider, SipMessage message) { public void onCallInvite(Call call, NameAddress callee, NameAddress caller, SdpMessage remoteSdp, SipMessage invite) { LOG.debug("onCallInvite()"); if (this.call!=null && !this.call.getState().isClosed()) { - LOG.debug("Busy, refusing incoming call from: " + invite.getFromUser()); + LOG.debug("Busy, refusing incoming call from: {}", invite.getFromUser()); call.refuse(); return; } - if (LOG.isDebugEnabled()) { - LOG.debug("Incoming call from: " + invite.getFromUser()); - } + LOG.debug("Incoming call from: {}", invite.getFromUser()); this.call=(ExtendedCall)call; call.ring(); @@ -446,7 +442,7 @@ public void onCallInvite(Call call, NameAddress callee, NameAddress caller, SdpM public void onCallModify(Call call, SdpMessage remoteSdp, SipMessage invite) { LOG.debug("onCallModify()"); if (call!=this.call) { - LOG.warn("Modify of unknown call received: " + call.getCallId()); + LOG.warn("Modify of unknown call received: {}", call.getCallId()); return; } LOG.debug("Received RE-INVITE/MODIFY."); @@ -497,12 +493,10 @@ public void onCallProgressConfirmed(Call call, SipMessage resp, SipMessage prack @Override public void onCallAccepted(Call call, SdpMessage remoteSdp, SipMessage resp) { if (call != this.call && call != call_transfer) { - LOG.debug("Ignoring accept for unknown call: " + call.getRemoteSessionDescriptor().getOrigin().getValue()); + LOG.debug("Ignoring accept for unknown call: {}", call.getRemoteSessionDescriptor().getOrigin().getValue()); return; } - if (LOG.isDebugEnabled()) { - LOG.debug("Call accepted: " + call.getRemoteSessionDescriptor().getOrigin().getValue()); - } + LOG.debug("Call accepted: {}", call.getRemoteSessionDescriptor().getOrigin().getValue()); if (_config.getNoOffer()) { AddressType addressType = remoteSdp.getAddressType(); @@ -523,12 +517,10 @@ public void onCallAccepted(Call call, SdpMessage remoteSdp, SipMessage resp) { @Override public void onCallConfirmed(Call call, SdpMessage sdp, SipMessage ack) { if (call != this.call) { - LOG.debug("Ignoring conform of unknown call: " + call.getRemoteSessionDescriptor().getOrigin().getValue()); + LOG.debug("Ignoring conform of unknown call: {}", call.getRemoteSessionDescriptor().getOrigin().getValue()); return; } - if (LOG.isDebugEnabled()) { - LOG.debug("Call confirmed: " + call.getRemoteSessionDescriptor().getOrigin().getValue()); - } + LOG.debug("Call confirmed: {}", call.getRemoteSessionDescriptor().getOrigin().getValue()); if (listener!=null) listener.onUaCallConfirmed(this); @@ -548,7 +540,7 @@ public void onCallModifyAccepted(Call call, SdpMessage sdp, SipMessage resp) { public void onCallModifyRefused(Call call, String reason, SipMessage resp) { LOG.debug("onCallReInviteRefused()"); if (call!=this.call) { LOG.debug("NOT the current call"); return; } - LOG.debug("RE-INVITE-REFUSED ("+reason+")/CALL"); + LOG.debug("RE-INVITE-REFUSED ({})/CALL", reason); if (listener!=null) listener.onUaCallFailed(this,reason); } @@ -557,7 +549,7 @@ public void onCallModifyRefused(Call call, String reason, SipMessage resp) { public void onCallRefused(Call call, String reason, SipMessage resp) { LOG.debug("onCallRefused()"); if (call!=this.call && call!=call_transfer) { LOG.debug("NOT the current call"); return; } - LOG.debug("REFUSED ("+reason+")"); + LOG.debug("REFUSED ({})", reason); if (call==call_transfer) { this.call.notify(resp); call_transfer=null; @@ -572,7 +564,7 @@ public void onCallRefused(Call call, String reason, SipMessage resp) { public void onCallRedirected(Call call, String reason, Vector contact_list, SipMessage resp) { LOG.debug("onCallRedirected()"); if (call!=this.call) { LOG.debug("NOT the current call"); return; } - LOG.debug("REDIRECTION ("+reason+")"); + LOG.debug("REDIRECTION ({})", reason); NameAddress first_contact=NameAddress.parse((String)contact_list.elementAt(0)); call.call(first_contact); } @@ -639,7 +631,7 @@ protected void onDtmfInfo(Call call, SipMessage msg, DTMFInfo dtmf) { super.onDtmfInfo(call, msg, dtmf); if (LOG.isDebugEnabled()) { - LOG.debug("Received DTMF info: " + dtmf); + LOG.debug("Received DTMF info: {}", dtmf); } if (listener!=null) listener.onDtmfInfo(this, dtmf); @@ -664,7 +656,7 @@ public void onCallUpdate(ExtendedCall call, SdpMessage sdp, SipMessage update) { public void onCallTransfer(ExtendedCall call, NameAddress refer_to, NameAddress refered_by, SipMessage refer) { LOG.debug("onCallTransfer()"); if (call!=this.call) { LOG.debug("NOT the current call"); return; } - LOG.debug("transfer to "+refer_to.toString()); + LOG.debug("transfer to {}", refer_to.toString()); call.acceptTransfer(); call_transfer=new ExtendedCall(sip_provider,new SipUser(_config.getUserURI()),this); AddressType addressType = ConnectionField.addressType(refer_to.getAddress().getSpecificPart()); From 14aad3c6d8e600af616c8ecd8fc5af7d135ac94e Mon Sep 17 00:00:00 2001 From: "Hajo.Thelen" Date: Wed, 4 Dec 2024 18:00:09 +0100 Subject: [PATCH 2/6] some mor incorrect usages of slf4j Logger --- .../java/org/mjsip/examples/UserAgentCli.java | 28 +++++++++---------- .../org/mjsip/sip/dialog/InviteDialog.java | 10 +++---- .../sip/transaction/AckTransactionClient.java | 2 +- .../transaction/InviteTransactionClient.java | 5 ++-- .../transaction/InviteTransactionServer.java | 4 +-- .../ReliableProvisionalResponder.java | 4 +-- .../mjsip/sip/transaction/Transaction.java | 2 +- .../sip/transaction/TransactionServer.java | 10 +++---- .../ua/registration/RegistrationClient.java | 16 +++++------ 9 files changed, 41 insertions(+), 40 deletions(-) diff --git a/mjsip-examples/src/main/java/org/mjsip/examples/UserAgentCli.java b/mjsip-examples/src/main/java/org/mjsip/examples/UserAgentCli.java index 52fab0f..374d500 100644 --- a/mjsip-examples/src/main/java/org/mjsip/examples/UserAgentCli.java +++ b/mjsip-examples/src/main/java/org/mjsip/examples/UserAgentCli.java @@ -102,7 +102,7 @@ public class UserAgentCli implements UserAgentListenerAdapter { /** Changes the call state */ protected void changeStatus(String state) { call_state=state; - LOG.debug("state: "+call_state); + LOG.debug("state: {}", call_state); } /** Checks the call state */ @@ -150,7 +150,7 @@ public void readyToReceive() { /** Makes a new call */ public void call(String target_uri) { - LOG.info("CALLING " + target_uri); + LOG.info("CALLING {}", target_uri); ua.call(target_uri, mediaAgent()); changeStatus(UA_OUTGOING_CALL); } @@ -271,7 +271,7 @@ public void onUaIncomingCall(UserAgent ua, NameAddress callee, NameAddress calle if (_uiConfig.redirectTo!=null) { // redirect the call ua.redirect(_uiConfig.redirectTo); - LOG.info("call redirected to "+_uiConfig.redirectTo); + LOG.info("call redirected to {}",_uiConfig.redirectTo); } else if (_uiConfig.acceptTime>=0) { @@ -281,7 +281,7 @@ public void onUaIncomingCall(UserAgent ua, NameAddress callee, NameAddress calle } else { changeStatus(UA_INCOMING_CALL); - LOG.info("incoming call from "+caller.toString()); + LOG.info("incoming call from {}", caller.toString()); LOG.info("accept? [yes/no]"); } } @@ -289,13 +289,13 @@ public void onUaIncomingCall(UserAgent ua, NameAddress callee, NameAddress calle /** When an ougoing call is stated to be in progress */ @Override public void onUaCallProgress(UserAgent ua) { - + // noop } /** When an ougoing call is remotly ringing */ @Override public void onUaCallRinging(UserAgent ua) { - + // noop } /** When an ougoing call has been accepted */ @@ -311,7 +311,7 @@ public void onUaCallAccepted(UserAgent ua) { /** When a call has been transferred */ @Override public void onUaCallTransferred(UserAgent ua) { - + // noop } /** When an incoming call has been cancelled */ @@ -350,13 +350,13 @@ public void onUaMediaSessionStopped(UserAgent ua, String type) { /** When registration succeeded. */ @Override public void onUaRegistrationSucceeded(UserAgent ua, String result) { - LOG.info("Registration succeeded: "+result); + LOG.info("Registration succeeded: {}", result); } /** When registration failed. */ @Override public void onUaRegistrationFailed(UserAgent ua, String result) { - LOG.error("Registration failed: "+result); + LOG.error("Registration failed: {}", result); } @@ -373,7 +373,7 @@ public void doWork() { }*/ /** Schedules a re-inviting after delay_time secs. It simply changes the contact address. */ void reInvite(final int delay_time) { - LOG.info("AUTOMATIC RE-INVITING/MODIFING: "+delay_time+" secs"); + LOG.info("AUTOMATIC RE-INVITING/MODIFING: {} secs", delay_time); if (delay_time==0) ua.modify(null); else sip_provider.scheduler().schedule(delay_time*1000L, () -> ua.modify(null)); @@ -391,7 +391,7 @@ public void doWork() { }*/ /** Schedules a call-transfer after delay_time secs. */ void callTransfer(final NameAddress transfer_to, final int delay_time) { - LOG.info("AUTOMATIC REFER/TRANSFER: "+delay_time+" secs"); + LOG.info("AUTOMATIC REFER/TRANSFER: {} secs", delay_time); if (delay_time==0) ua.transfer(transfer_to); else sip_provider.scheduler().schedule(delay_time*1000L, () -> ua.transfer(transfer_to)); @@ -408,7 +408,7 @@ public void doWork() { }*/ /** Schedules an automatic answer after delay_time secs. */ void automaticAccept(final int delay_time) { - LOG.info("AUTOMATIC ANSWER: "+delay_time+" secs"); + LOG.info("AUTOMATIC ANSWER: {} secs", delay_time); if (delay_time==0) accept(); else sip_provider.scheduler().schedule(delay_time*1000L, this::accept); @@ -425,7 +425,7 @@ public void doWork() { }*/ /** Schedules an automatic hangup after delay_time secs. */ void automaticHangup(final int delay_time) { - LOG.info("AUTOMATIC HANGUP: "+delay_time+" secs"); + LOG.info("AUTOMATIC HANGUP: {} secs", delay_time); if (delay_time==0) hangup(); else sip_provider.scheduler().schedule(delay_time*1000L, this::hangup); @@ -433,7 +433,7 @@ void automaticHangup(final int delay_time) { /** Schedules an automatic re-call after delay_time secs. */ void automaticCall(final int delay_time, final String remote_uri) { - LOG.info("AUTOMATIC RE-CALL: "+delay_time+" secs"); + LOG.info("AUTOMATIC RE-CALL: {} secs", delay_time); if (delay_time==0) call(remote_uri); else sip_provider.scheduler().schedule(delay_time*1000L, () -> call(remote_uri)); diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/dialog/InviteDialog.java b/mjsip-sip/src/main/java/org/mjsip/sip/dialog/InviteDialog.java index 1e05fb0..978acb0 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/dialog/InviteDialog.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/dialog/InviteDialog.java @@ -459,7 +459,7 @@ public void refuse() { * See {@link SipResponses}. */ public void refuse(int code, String reason) { - LOG.debug("inside refuse("+code+","+((reason!=null)?reason:SipResponses.reasonOf(code))+")"); + LOG.debug("inside refuse({},{})", code, (reason != null) ? reason : SipResponses.reasonOf(code)); respond(code,reason,null,null,null); } @@ -472,7 +472,7 @@ public void refuse(int code, String reason) { * See {@link SipResponses}. */ public void redirect(int code, String reason, NameAddress contact) { - LOG.debug("inside redirect("+code+","+reason+","+contact.toString()+")"); + LOG.debug("inside redirect({},{},{})", code, reason, contact); respond(code,reason,contact,null,null); } @@ -490,7 +490,7 @@ public void redirect(int code, String reason, NameAddress contact) { * the message body to be included within the response message, or null */ public void respond(int code, String reason, NameAddress contact, String content_type, byte[] body) { - LOG.debug("inside respond("+code+","+reason+")"); + LOG.debug("inside respond({},{})", code, reason); if (statusIs(DialogStatus.D_INVITED) || statusIs(DialogStatus.D_ReINVITED)) { SipMessage resp=sipMessageFactory.createResponse(invite_req,code,reason,contact); resp.setBody(content_type,body); @@ -501,7 +501,7 @@ public void respond(int code, String reason, NameAddress contact, String content respond(resp); } else { - LOG.warn("Dialog isn't in \"invited\" state: cannot respond ("+code+"/"+getStatus()+"/"+getDialogID()+")"); + LOG.warn("Dialog isn't in \"invited\" state: cannot respond ({}/{}/{})", code, getStatus(), getDialogID()); } } @@ -1073,7 +1073,7 @@ public void onTransProvisionalResponse(TransactionClient tc, SipMessage msg) { * removes the listener from SipProvider, and fires onClose(this,msg). */ @Override public void onTransFailureResponse(TransactionClient tc, SipMessage msg) { - LOG.debug("inside onTransFailureResponse("+tc.getTransactionId()+",msg)"); + LOG.debug("inside onTransFailureResponse({},{})", tc.getTransactionId(), msg); if (tc.getTransactionMethod().equals(SipMethods.INVITE)) { if (!verifyStatus("INVITE failure response requires INVITING state.", statusIs(DialogStatus.D_INVITING) || statusIs(DialogStatus.D_ReINVITING))) { diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/AckTransactionClient.java b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/AckTransactionClient.java index 438708d..4596da9 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/AckTransactionClient.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/AckTransactionClient.java @@ -49,7 +49,7 @@ public AckTransactionClient(SipProvider sip_provider, SipMessage ack, Transactio request=new SipMessage(ack); transaction_listener=listener; transaction_id=SipId.createTransactionClientId(request); - LOG.info("new transaction-id: "+transaction_id.toString()); + LOG.info("new transaction-id: {}", transaction_id); } /** Starts the AckTransactionClient and sends the ACK request. */ diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/InviteTransactionClient.java b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/InviteTransactionClient.java index 4dfaa0d..dc5980e 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/InviteTransactionClient.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/InviteTransactionClient.java @@ -71,7 +71,7 @@ void init(TransactionClientListener listener, SipId transaction_id) { this.transaction_id=transaction_id; this.ack=null; // init the timer just to set the timeout value and label, without listener (never started) - LOG.info("new transaction-id: "+transaction_id.toString()); + LOG.info("new transaction-id: {}", transaction_id); } @@ -159,7 +159,8 @@ private void onTransmission() { scheduleRetransmission(sip_provider.sipConfig().getRetransmissionTimeout()); } - else LOG.trace("No retransmissions for reliable transport ("+connection_id+")"); + else + LOG.trace("No retransmissions for reliable transport ({})", connection_id); } /** Terminates the transaction. */ diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/InviteTransactionServer.java b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/InviteTransactionServer.java index 3b58a9b..8e1b127 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/InviteTransactionServer.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/InviteTransactionServer.java @@ -116,7 +116,7 @@ void init(InviteTransactionServerListener listener, SipId transaction_id, Connec auto_trying=sip_provider.sipConfig().isAutoTrying(); // init the timer just to set the timeout value and label, without listener (never started) if (LOG.isDebugEnabled()) { - LOG.debug("new transaction-id: " + transaction_id.toString()); + LOG.debug("new transaction-id: {}", transaction_id); } } @@ -164,7 +164,7 @@ public void respondWith(SipMessage resp) { //end_to.start(); } else { - LOG.trace("No retransmissions for reliable transport ("+connection_id+")"); + LOG.trace("No retransmissions for reliable transport ({})", connection_id); //onTimeout(end_to); } end_to = sip_provider.scheduler().schedule(sip_provider.sipConfig().getTransactionTimeout(), diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/ReliableProvisionalResponder.java b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/ReliableProvisionalResponder.java index 9c4741e..8569060 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/ReliableProvisionalResponder.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/ReliableProvisionalResponder.java @@ -127,9 +127,9 @@ public synchronized void processPrack(SipProvider sip_provider, SipMessage prack if (listener!=null) listener.onReliableProvisionalResponseConfirmation(this,resp,prack); if (retransmission_to==null && hasPendingResponses()) sendNextResponse(); } - else LOG.warn(prack.getRequestLine().getMethod()+" confirmation received for past response?"); + else LOG.warn("{} confirmation received for past response?", prack.getRequestLine().getMethod()); } - else LOG.warn(prack.getRequestLine().getMethod()+" no provisional response waiting for confirmation has been found"); + else LOG.warn("{} no provisional response waiting for confirmation has been found", prack.getRequestLine().getMethod()); } diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/Transaction.java b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/Transaction.java index 683cfb3..0af8e8b 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/Transaction.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/Transaction.java @@ -118,7 +118,7 @@ protected Transaction(SipProvider sip_provider) { protected void changeStatus(int newstatus) { status=newstatus; //transaction_listener.onChangedTransactionStatus(status); - LOG.debug("changed transaction state: "+getStatus()); + LOG.debug("changed transaction state: {}", getStatus()); } /** Whether the internal status is equal to st */ diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/TransactionServer.java b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/TransactionServer.java index 4cbcce1..8498fbf 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/TransactionServer.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/TransactionServer.java @@ -90,7 +90,7 @@ protected void init(TransactionServerListener listener, SipId transaction_id, Co this.response=null; // init the timer just to set the timeout value and label, without listener (never started) if (LOG.isDebugEnabled()) { - LOG.debug("Starting transaction " + transaction_id.toString() + ": " + request); + LOG.debug("Starting transaction {}:{}", transaction_id, request); } } @@ -119,7 +119,7 @@ public void respondWith(int code) { /** Sends a response message */ public void respondWith(SipMessage resp) { if (LOG.isDebugEnabled()) { - LOG.debug("Transaction " + transaction_id.toString() + " response: " + resp); + LOG.debug("Transaction {} response: {}", transaction_id, resp); } response=resp; @@ -155,7 +155,7 @@ public void terminate() { @Override public void onReceivedMessage(SipProvider provider, SipMessage msg) { if (LOG.isDebugEnabled()) { - LOG.debug("Transaction " + transaction_id.toString() + ": " + msg); + LOG.debug("Transaction {}:{}", transaction_id, msg); } if (msg.isRequest()) { @@ -182,7 +182,7 @@ public void onReceivedMessage(SipProvider provider, SipMessage msg) { protected void onClearingTimeout() { if (LOG.isDebugEnabled()) { - LOG.debug("Transaction timeout reached: " + transaction_id.toString()); + LOG.debug("Transaction timeout reached: {}", transaction_id); } doTerminate(); } @@ -200,7 +200,7 @@ protected void doTerminate() { changeStatus(STATE_TERMINATED); if (LOG.isDebugEnabled()) { - LOG.debug("Transaction terminated: " + transaction_id.toString()); + LOG.debug("Transaction terminated: {}", transaction_id); } } } diff --git a/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java b/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java index 3b3286b..0e91680 100644 --- a/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java +++ b/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java @@ -236,15 +236,15 @@ protected void register(int expire_time, String content_type, byte[] body) { req.setAuthorizationHeader(ah); } if (body!=null) { - LOG.debug("Register body type: " + content_type + "; length: " + body.length + " bytes"); + LOG.debug("Register body type: {}; length: {} bytes", content_type, body.length); req.setBody(content_type,body); } if (LOG.isDebugEnabled()) { if (expire_time > 0) { - LOG.debug("Registering " + _contactNAddr + " (expiry " + expire_time + " secs) at " + _registrarUri); + LOG.debug("Registering {} (expiry {} secs) at {}", _contactNAddr, expire_time, _registrarUri); } else { - LOG.debug("Unregistering " + _contactNAddr + " from " + _registrarUri); + LOG.debug("Unregistering {} from {}", _contactNAddr, _registrarUri); } } @@ -405,7 +405,7 @@ public void onTransFailureResponse(TransactionClient transaction, SipMessage res req.addViaHeader(vh); WwwAuthenticateHeader wah=resp.getWwwAuthenticateHeader(); String qop_options=wah.getQopOptionsParam(); - //LOG.debug("qop-options: "+qop_options); + //LOG.debug("qop-options: {}", qop_options); _qop=(qop_options!=null)? "auth" : null; AuthorizationHeader ah=(new DigestAuthentication(SipMethods.REGISTER,req.getRequestLine().getAddress().toString(),wah,_qop,null,0,null,_username,_passwd)).getAuthorizationHeader(); req.setAuthorizationHeader(ah); @@ -420,7 +420,7 @@ public void onTransFailureResponse(TransactionClient transaction, SipMessage res req.setCSeqHeader(req.getCSeqHeader().incSequenceNumber()); ProxyAuthenticateHeader pah=resp.getProxyAuthenticateHeader(); String qop_options=pah.getQopOptionsParam(); - //LOG.debug("qop-options: "+qop_options); + //LOG.debug("qop-options: {}", qop_options); _qop=(qop_options!=null)? "auth" : null; ProxyAuthorizationHeader ah=(new DigestAuthentication(SipMethods.REGISTER,req.getRequestLine().getAddress().toString(),pah,_qop,null,0,null,_username,_passwd)).getProxyAuthorizationHeader(); req.setProxyAuthorizationHeader(ah); @@ -429,7 +429,7 @@ public void onTransFailureResponse(TransactionClient transaction, SipMessage res } else { // Registration failure String result=code+" "+status.getReason(); - LOG.info("Registration of " + _contactNAddr + " failed: "+result); + LOG.info("Registration of {} failed: {}",_contactNAddr, result); if (_listener != null) { _listener.onRegistrationFailure(this, _toNAddr, _contactNAddr, result); } @@ -444,7 +444,7 @@ public void onTransFailureResponse(TransactionClient transaction, SipMessage res @Override public void onTransTimeout(TransactionClient transaction) { if (transaction.getTransactionMethod().equals(SipMethods.REGISTER)) { - LOG.info("Registration of " + _contactNAddr + " timed out."); + LOG.info("Registration of {} timed out.", _contactNAddr); if (_listener != null) { _listener.onRegistrationFailure(this, _toNAddr, _contactNAddr, "Timeout"); } @@ -472,7 +472,7 @@ private void scheduleNextAttempt(long timeout) { _attemptTimer = _sipProvider.scheduler().schedule(timeout, this::onAttemptTimeout); - LOG.info("Waiting " + (timeout / 1000) + "s for next registration of " + _contactNAddr + "."); + LOG.info("Waiting {}ms for next registration of {}.", timeout, _contactNAddr); } From c3cf45866c7631207e075f62342c2401b52d68dd Mon Sep 17 00:00:00 2001 From: "Hajo.Thelen" Date: Wed, 4 Dec 2024 18:21:57 +0100 Subject: [PATCH 3/6] where is the request header --- .../java/org/mjsip/ua/registration/RegistrationClient.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java b/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java index 0e91680..0d92429 100644 --- a/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java +++ b/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java @@ -20,6 +20,7 @@ */ package org.mjsip.ua.registration; +import java.util.Arrays; import java.util.Vector; import java.util.concurrent.ScheduledFuture; @@ -248,6 +249,9 @@ protected void register(int expire_time, String content_type, byte[] body) { } } + // where is the Accept header ? + System.out.printf("XX\nXX\nXX Allowed Methods: %s", req.getAcceptHeader() != null ? req.getAcceptHeader().getParameters() : "n/a" ); + TransactionClient t=new TransactionClient(_sipProvider,req,this); t.request(); } From c51e653db308601a8c4122e1c048b7b2516b87fb Mon Sep 17 00:00:00 2001 From: "Hajo.Thelen" Date: Thu, 5 Dec 2024 13:23:57 +0100 Subject: [PATCH 4/6] celeaned up the imporper use of SLF4J --- .../org/mjsip/examples/AnsweringMachine.java | 6 ++-- .../main/java/org/mjsip/examples/Echo.java | 2 +- .../org/mjsip/examples/MessageAgentCli.java | 10 +++--- .../java/org/mjsip/examples/MiniJukebox.java | 2 +- .../java/org/zoolu/net/TcpConnection.java | 12 +++---- .../java/org/mjsip/phone/gui/StringList.java | 2 +- .../org/mjsip/phone/gui/UserAgentGui.java | 14 ++++---- .../server/AuthenticationServerImpl.java | 6 ++-- .../server/AuthenticationServiceImpl.java | 4 +-- .../java/org/mjsip/server/CallLoggerImpl.java | 30 ++++++++++------- .../org/mjsip/server/LocationServiceImpl.java | 4 +-- .../src/main/java/org/mjsip/server/Proxy.java | 31 ++++++++--------- .../main/java/org/mjsip/server/Registrar.java | 22 ++++++------- .../java/org/mjsip/server/ServerEngine.java | 33 +++++++++---------- .../java/org/mjsip/server/StatefulProxy.java | 22 ++++++------- .../org/mjsip/server/sbc/AddressResolver.java | 10 +++--- .../server/sbc/AddressResolverKeepAlive.java | 8 ++--- .../mjsip/server/sbc/ExtendedSipProvider.java | 6 ++-- .../server/sbc/InterceptingUdpRelay.java | 6 ++-- .../java/org/mjsip/server/sbc/MediaGw.java | 22 +++++++------ .../server/sbc/SessionBorderController.java | 8 ++--- .../sbc/SymmetricRegulatedUdpRelay.java | 8 ++--- .../mjsip/server/sbc/SymmetricUdpRelay.java | 18 +++++----- .../java/org/mjsip/media/AudioStreamer.java | 28 ++++++++-------- .../mjsip/media/LoopbackMediaStreamer.java | 4 +-- .../org/mjsip/media/NativeMediaStreamer.java | 2 +- .../org/mjsip/media/RtpStreamReceiver.java | 6 ++-- .../java/org/mjsip/media/RtpStreamSender.java | 6 ++-- .../org/mjsip/media/rx/AudioFileReceiver.java | 4 +-- .../org/mjsip/media/rx/JavaxAudioOutput.java | 2 +- .../mjsip/media/tx/AudioFileTransmitter.java | 2 +- .../org/mjsip/media/tx/JavaxAudioInput.java | 2 +- .../org/mjsip/media/tx/ToneTransmitter.java | 2 +- .../main/java/org/mjsip/sip/call/Call.java | 4 +-- .../java/org/mjsip/sip/call/CancelServer.java | 3 +- .../java/org/mjsip/sip/call/ExtendedCall.java | 8 ++--- .../mjsip/sip/call/NotImplementedServer.java | 2 +- .../org/mjsip/sip/call/OptionsServer.java | 2 +- .../java/org/mjsip/sip/dialog/Dialog.java | 12 +++---- .../sip/dialog/ExtendedInviteDialog.java | 12 +++---- .../org/mjsip/sip/provider/SipProvider.java | 27 ++++++++------- .../mjsip/sip/provider/SipTransportCO.java | 26 +++++++-------- .../org/mjsip/sip/provider/TcpTransport.java | 8 ++--- .../sip/provider/TcpTransportConnection.java | 2 +- .../org/mjsip/sip/provider/TlsTransport.java | 10 +++--- .../sip/transaction/AckTransactionServer.java | 5 +-- .../sip/transaction/TransactionClient.java | 6 ++-- .../sound/ConvertedAudioOutputStream.java | 8 ++--- .../org/zoolu/sound/SimpleAudioSystem.java | 20 +++++------ .../sound/SourceLineAudioOutputStream.java | 4 +-- .../main/java/org/zoolu/sound/codec/AMR.java | 6 ++-- .../amr/AmrFormatConversionProvider.java | 14 ++++---- .../codec/amr/AmrToPcmAudioInputStream.java | 19 +++++++++-- .../codec/amr/PcmToAmrAudioInputStream.java | 15 +++++++-- .../g711/G711FormatConversionProvider.java | 22 +++++-------- .../codec/g711/G711ToPcmAudioInputStream.java | 2 +- .../codec/g711/PcmToG711AudioInputStream.java | 2 +- .../g726/G726FormatConversionProvider.java | 14 ++++---- .../codec/g726/G726ToPcmAudioInputStream.java | 2 +- .../codec/g726/PcmToG726AudioInputStream.java | 2 +- .../main/java/org/mjsip/ua/MessageAgent.java | 4 +-- .../org/mjsip/ua/RegisteringMultipleUAS.java | 6 ++-- .../org/mjsip/ua/clip/AudioClipPlayer.java | 6 ++-- .../ua/registration/RegistrationClient.java | 3 -- .../ua/registration/RegistrationLogger.java | 5 ++- .../main/java/org/zoolu/util/Configure.java | 4 +-- 66 files changed, 326 insertions(+), 303 deletions(-) diff --git a/mjsip-examples/src/main/java/org/mjsip/examples/AnsweringMachine.java b/mjsip-examples/src/main/java/org/mjsip/examples/AnsweringMachine.java index e83d1fb..f55f6fe 100644 --- a/mjsip-examples/src/main/java/org/mjsip/examples/AnsweringMachine.java +++ b/mjsip-examples/src/main/java/org/mjsip/examples/AnsweringMachine.java @@ -88,7 +88,7 @@ protected UserAgentListener createCallHandler(SipMessage msg) { @Override public void onUaIncomingCall(UserAgent ua, NameAddress callee, NameAddress caller, MediaDesc[] media_descs) { - LOG.info("Incomming call from: " + callee.getAddress()); + LOG.info("Incomming call from: {}", callee.getAddress()); ua.accept(new MediaAgent(_mediaConfig.getMediaDescs(), _streamerFactory)); } }; @@ -98,7 +98,7 @@ public void onUaIncomingCall(UserAgent ua, NameAddress callee, NameAddress calle * The main entry point. */ public static void main(String[] args) throws UnsupportedAudioFileException, IOException { - LOG.info(AnsweringMachine.class.getSimpleName() + " " + SipStack.version); + LOG.info("{} {}", AnsweringMachine.class.getSimpleName(), SipStack.version); SipConfig sipConfig = new SipConfig(); UAConfig uaConfig = new UAConfig(); @@ -115,7 +115,7 @@ public static void main(String[] args) throws UnsupportedAudioFileException, IOE if (mediaConfig.getSendFile() != null) { AudioFileFormat audioFormat = AudioSystem.getAudioFileFormat(new File(mediaConfig.getSendFile())); - LOG.info("Announcement file format: " + audioFormat); + LOG.info("Announcement file format: {}", audioFormat); } StreamerFactory streamerFactory = ExampleStreamerFactory.createStreamerFactory(mediaConfig, uaConfig); diff --git a/mjsip-examples/src/main/java/org/mjsip/examples/Echo.java b/mjsip-examples/src/main/java/org/mjsip/examples/Echo.java index cbd03c9..de4367f 100644 --- a/mjsip-examples/src/main/java/org/mjsip/examples/Echo.java +++ b/mjsip-examples/src/main/java/org/mjsip/examples/Echo.java @@ -96,7 +96,7 @@ public void onReceivedMessage(SipProvider sip_provider, SipMessage msg) { NameAddress sender=msg.getFromHeader().getNameAddress(); String content_type=msg.getContentTypeHeader().getContentType(); byte[] content=msg.getBody(); - LOG.info("message received: "+new String(content)); + LOG.info("message received: {}", new String(content)); //not so nice, but if you want the bytes as characters ... // respond TransactionServer ts=new TransactionServer(sip_provider,msg,null); ts.respondWith(SipResponses.OK); diff --git a/mjsip-examples/src/main/java/org/mjsip/examples/MessageAgentCli.java b/mjsip-examples/src/main/java/org/mjsip/examples/MessageAgentCli.java index 4a47f89..f52c080 100644 --- a/mjsip-examples/src/main/java/org/mjsip/examples/MessageAgentCli.java +++ b/mjsip-examples/src/main/java/org/mjsip/examples/MessageAgentCli.java @@ -71,22 +71,22 @@ public void send(String recipient, String subject, String text) { public void onMaReceivedMessage(MessageAgent ma, NameAddress sender, NameAddress recipient, String subject, String content_type, String content) { remote_user=sender; LOG.info("NEW MESSAGE:"); - LOG.info("From: " + sender); + LOG.info("From: {}", sender); if (subject != null) - LOG.info("Subject: " + subject); - LOG.info("Content: " + content); + LOG.info("Subject: {}", subject); + LOG.info("Content: {}", content); } /** When a message delivery successes. */ @Override public void onMaDeliverySuccess(MessageAgent ma, NameAddress recipient, String subject, String result) { - //LOG.info("Delivery success: "+result); + //LOG.info("Delivery success: {}", result); } /** When a message delivery fails. */ @Override public void onMaDeliveryFailure(MessageAgent ma, NameAddress recipient, String subject, String result) { - //LOG.info("Delivery failure: "+result); + //LOG.info("Delivery failure: {}", result); } } diff --git a/mjsip-examples/src/main/java/org/mjsip/examples/MiniJukebox.java b/mjsip-examples/src/main/java/org/mjsip/examples/MiniJukebox.java index 99683a1..87af252 100644 --- a/mjsip-examples/src/main/java/org/mjsip/examples/MiniJukebox.java +++ b/mjsip-examples/src/main/java/org/mjsip/examples/MiniJukebox.java @@ -63,7 +63,7 @@ public MiniJukebox(SipProvider sip_provider, PortPool portPool, ServiceOptions s /** From UserAgentListener. When a new call is incoming */ public void onUaIncomingCall(UserAgent ua, NameAddress callee, NameAddress caller) { - LOG.info("incoming call from "+caller.toString()); + LOG.info("incoming call from {}", caller); String audio_file=callee.getAddress().getParameter(PARAM_RESOURCE); if (audio_file!=null) { if (new File(audio_file).isFile()) { diff --git a/mjsip-net/src/main/java/org/zoolu/net/TcpConnection.java b/mjsip-net/src/main/java/org/zoolu/net/TcpConnection.java index d0f8b87..9a98d3a 100644 --- a/mjsip-net/src/main/java/org/zoolu/net/TcpConnection.java +++ b/mjsip-net/src/main/java/org/zoolu/net/TcpConnection.java @@ -140,7 +140,7 @@ public int getLocalPort() { /** Stops running. */ public void halt() { if (!stop) { - LOG.debug("Stopping TCP connection to: " + socket); + LOG.debug("Stopping TCP connection to: {}", socket); stop = true; } } @@ -152,7 +152,7 @@ public void send(byte[] buff, int offset, int len) throws IOException { ostream.write(buff,offset,len); ostream.flush(); - LOG.debug("Sent " + len + " bytes to: " + socket); + LOG.debug("Sent {} bytes to: {}", len , socket); } } @@ -166,7 +166,7 @@ public void send(byte[] buff) throws IOException { /** Runs the tcp receiver. */ @Override public void run() { - LOG.debug("Starting connection handler for: " + socket); + LOG.debug("Starting connection handler for: {}", socket); byte[] buff=new byte[BUFFER_SIZE]; long expire=0; @@ -187,7 +187,7 @@ public void run() { } } if (len<0) { - LOG.debug("Connection closed: " + socket); + LOG.debug("Connection closed: {}", socket); stop=true; } else if (len > 0) { if (listener!=null) listener.onReceivedData(this,buff,len); @@ -196,7 +196,7 @@ public void run() { } } catch (IOException e) { - LOG.info("TCP connection terminated: " + e.getMessage()); + LOG.info("TCP connection terminated: {}", e.getMessage()); error=e; stop=true; } @@ -206,7 +206,7 @@ public void run() { if (listener!=null) listener.onConnectionTerminated(this,error); listener=null; - LOG.debug("Connection handler terminated for: " + socket); + LOG.debug("Connection handler terminated for: {}", socket); } diff --git a/mjsip-phone/src/main/java/org/mjsip/phone/gui/StringList.java b/mjsip-phone/src/main/java/org/mjsip/phone/gui/StringList.java index 7692f27..338817f 100644 --- a/mjsip-phone/src/main/java/org/mjsip/phone/gui/StringList.java +++ b/mjsip-phone/src/main/java/org/mjsip/phone/gui/StringList.java @@ -68,7 +68,7 @@ protected void saveFile(File file) { writeTo(new FileWriter(file)); } catch (IOException e) { - LOG.error("Failed writing file \""+file+"\"", e); + LOG.error("Failed writing file ({})", file, e); } } diff --git a/mjsip-phone/src/main/java/org/mjsip/phone/gui/UserAgentGui.java b/mjsip-phone/src/main/java/org/mjsip/phone/gui/UserAgentGui.java index cba5ec7..9744532 100644 --- a/mjsip-phone/src/main/java/org/mjsip/phone/gui/UserAgentGui.java +++ b/mjsip-phone/src/main/java/org/mjsip/phone/gui/UserAgentGui.java @@ -168,7 +168,7 @@ public class UserAgentGui extends JFrame implements UserAgentListenerAdapter { /** Changes the call state */ protected void changeStatus(String state) { call_state=state; - LOG.debug("state: "+call_state); + LOG.debug("state: {}", call_state); } /** Checks the call state */ @@ -395,7 +395,7 @@ protected void run() { if (_uiConfig.callTo!=null) { // ########## make a call with the remote URI - LOG.info("UAC: CALLING " + _uiConfig.callTo); + LOG.info("UAC: CALLING {}", _uiConfig.callTo); jComboBox1.setSelectedItem(null); comboBoxEditor1.setItem(_uiConfig.callTo.toString()); display.setText("CALLING "+_uiConfig.callTo); @@ -487,7 +487,7 @@ void comboBoxEditor1_actionPerformed(ActionEvent e) { } if (name==null) { - LOG.debug("No SIP URI recognized in: "+(String)comboBoxEditor1.getItem()); + LOG.debug("No SIP URI recognized in: {}", (String)comboBoxEditor1.getItem()); return; } @@ -638,7 +638,7 @@ public void doWork() { }*/ /** Schedules a re-inviting after delay_time secs. It simply changes the contact address. */ void reInvite(final int delay_time) { - LOG.info("AUTOMATIC RE-INVITING/MODIFING: "+delay_time+" secs"); + LOG.info("AUTOMATIC RE-INVITING/MODIFING: {} secs", delay_time); if (delay_time==0) ua.modify(null); else sip_provider.scheduler().schedule((long) (delay_time*1000), ()->ua.modify(null)); @@ -656,7 +656,7 @@ public void doWork() { }*/ /** Schedules a call-transfer after delay_time secs. */ void callTransfer(final NameAddress transfer_to, final int delay_time) { - LOG.info("AUTOMATIC REFER/TRANSFER: "+delay_time+" secs"); + LOG.info("AUTOMATIC REFER/TRANSFER: {} secs", delay_time); if (delay_time==0) ua.transfer(transfer_to); else sip_provider.scheduler().schedule((long) (delay_time*1000), () -> ua.transfer(transfer_to)); @@ -674,7 +674,7 @@ public void doWork() { }*/ /** Schedules an automatic answer after delay_time secs. */ void automaticAccept(final int delay_time) { - LOG.info("AUTOMATIC ANSWER: "+delay_time+" secs"); + LOG.info("AUTOMATIC ANSWER: {} secs", delay_time); if (delay_time==0) jButton1_actionPerformed(); else sip_provider.scheduler().schedule((long) (delay_time*1000), this::jButton1_actionPerformed); @@ -692,7 +692,7 @@ public void doWork() { }*/ /** Schedules an automatic hangup after delay_time secs. */ void automaticHangup(final int delay_time) { - LOG.info("AUTOMATIC HANGUP: "+delay_time+" secs"); + LOG.info("AUTOMATIC HANGUP: {} secs", delay_time); if (delay_time==0) jButton2_actionPerformed(); else sip_provider.scheduler().schedule((long) (delay_time*1000), this::jButton2_actionPerformed); diff --git a/mjsip-server/src/main/java/org/mjsip/server/AuthenticationServerImpl.java b/mjsip-server/src/main/java/org/mjsip/server/AuthenticationServerImpl.java index 8d8949a..71ba8cc 100644 --- a/mjsip-server/src/main/java/org/mjsip/server/AuthenticationServerImpl.java +++ b/mjsip-server/src/main/java/org/mjsip/server/AuthenticationServerImpl.java @@ -164,18 +164,18 @@ protected SipMessage authenticateRequest(SipMessage msg, int type) { if (!is_authorized) { err_resp=sip_provider.messageFactory().createResponse(msg,SipResponses.FORBIDDEN,null,null); - LOG.info("Login error: Authentication of '" + user + "' failed"); + LOG.info("Login error: Authentication of '{}' failed", user); } else { // authentication/authorization successed - LOG.info("Authentication of '"+user+"' successed"); + LOG.info("Authentication of '{}' successed", user); } } else { // authentication/authorization failed int result=400; // response code 400 ("Bad request") err_resp=sip_provider.messageFactory().createResponse(msg,result,null,null); - LOG.info("Authentication method '"+scheme+"' not supported."); + LOG.info("Authentication method '{}' not supported.", scheme); } } else { diff --git a/mjsip-server/src/main/java/org/mjsip/server/AuthenticationServiceImpl.java b/mjsip-server/src/main/java/org/mjsip/server/AuthenticationServiceImpl.java index c5cebdc..3ced092 100644 --- a/mjsip-server/src/main/java/org/mjsip/server/AuthenticationServiceImpl.java +++ b/mjsip-server/src/main/java/org/mjsip/server/AuthenticationServiceImpl.java @@ -200,7 +200,7 @@ public void load() { } if (user != null) addUser(user, key); } catch (FileNotFoundException e) { - LOG.warn("file \"" + filename + "\" not found: created new empty DB"); + LOG.warn("file \"{}\" not found: created new empty DB", filename); } catch (IOException e) { e.printStackTrace(); } @@ -213,7 +213,7 @@ public synchronized void save() { out.write(this.toString()); } catch (IOException e) { - LOG.warn("error trying to write on file \""+filename+"\"", e); + LOG.warn("error trying to write on file \"{}\"", filename, e); } } diff --git a/mjsip-server/src/main/java/org/mjsip/server/CallLoggerImpl.java b/mjsip-server/src/main/java/org/mjsip/server/CallLoggerImpl.java index fb6ec82..cdd0b49 100644 --- a/mjsip-server/src/main/java/org/mjsip/server/CallLoggerImpl.java +++ b/mjsip-server/src/main/java/org/mjsip/server/CallLoggerImpl.java @@ -8,6 +8,7 @@ import org.mjsip.sip.header.StatusLine; import org.mjsip.sip.message.SipMessage; import org.mjsip.sip.message.SipMethods; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.zoolu.util.DateFormat; @@ -39,8 +40,9 @@ public class CallLoggerImpl implements CallLogger { /** Set : (String)call_id. */ Vector calls; - /** Costructs a new CallLoggerImpl. - */ + /** + * Costructs a new CallLoggerImpl. + */ public CallLoggerImpl(String filename) { invite_dates=new Hashtable<>(); accepted_dates=new Hashtable<>(); @@ -128,27 +130,31 @@ private void insert(Hashtable table, String call_id, Date time) { } - /** Prints a generic event log. - */ + /** + * Prints a generic event log. + * + * FIXME mybe this function partially replicates things {@link Logger} does + */ private void eventlog(Date time, String call_id, String event, String caller, String callee) { //call_logger.log(DateFormat.formatHHMMSS(time)+"\t"+call_id+"\t"+event+"\t"+caller+"\t"+callee); - LOG.info(DateFormat.formatYyyyMMddHHmmssSSS(time) + "\t" + call_id + "\t" + event + "\t" + caller + "\t" - + callee); + LOG.info("{}\t{}\t{}\t{}\t{]", DateFormat.formatYyyyMMddHHmmssSSS(time), call_id, event, caller, callee); } - /** Prints a call report. - */ + /** + * Prints a call report. + */ private void calllog(String call_id) { Date invite_time=invite_dates.get(call_id); Date accepted_time=accepted_dates.get(call_id); Date bye_time=bye_dates.get(call_id); if (invite_time!=null && accepted_time!=null && bye_time!=null) //call_logger.log(DateFormat.formatHHMMSS(invite_time)+"\t"+call_id+"\tCALL \t"+callers.get(call_id)+"\t"+callees.get(call_id)+"\t"+(accepted_time.getTime()-invite_time.getTime())+"\t"+(bye_time.getTime()-accepted_time.getTime())); - LOG.info(DateFormat.formatYyyyMMddHHmmssSSS(invite_time) + "\t" + call_id + "\tCALL \t" - + callers.get(call_id) + "\t" + callees.get(call_id) + "\t" - + (accepted_time.getTime() - invite_time.getTime()) + "\t" - + (bye_time.getTime() - accepted_time.getTime())); + LOG.info("{}\t{}\tCALL \t{}\t{}\t{}\t{}", + DateFormat.formatYyyyMMddHHmmssSSS(invite_time), call_id, callers.get(call_id), callees.get(call_id), + (accepted_time.getTime() - invite_time.getTime()), + (bye_time.getTime() - accepted_time.getTime()) + ); } } diff --git a/mjsip-server/src/main/java/org/mjsip/server/LocationServiceImpl.java b/mjsip-server/src/main/java/org/mjsip/server/LocationServiceImpl.java index 09ae6eb..f84b7bd 100644 --- a/mjsip-server/src/main/java/org/mjsip/server/LocationServiceImpl.java +++ b/mjsip-server/src/main/java/org/mjsip/server/LocationServiceImpl.java @@ -333,7 +333,7 @@ private void load() { } } } catch (FileNotFoundException e) { - LOG.warn("file \"" + file_name + "\" not found: created new empty DB"); + LOG.warn("file \"{}\" not found: created new empty DB", file_name); } catch (IOException e) { e.printStackTrace(); } @@ -349,7 +349,7 @@ private synchronized void save() { out.write(this.toString()); } catch (IOException e) { - LOG.warn("error trying to write on file \""+file_name+"\"", e); + LOG.warn("error trying to write on file \"{}\"", file_name, e); } } diff --git a/mjsip-server/src/main/java/org/mjsip/server/Proxy.java b/mjsip-server/src/main/java/org/mjsip/server/Proxy.java index fdbe86e..bee515c 100644 --- a/mjsip-server/src/main/java/org/mjsip/server/Proxy.java +++ b/mjsip-server/src/main/java/org/mjsip/server/Proxy.java @@ -112,7 +112,7 @@ public void processRequestToLocalUser(SipMessage msg) { return; } - LOG.debug("message will be forwarded to "+targets.size()+" user's contact(s)"); + LOG.debug("message will be forwarded to {} user's contact(s)", targets.size()); for (int i=0; i getTargets(SipMessage msg) { return targets; } String user=username+"@"+sip_uri.getHost(); - LOG.debug("user: "+user); + LOG.debug("user: {}", user); if (!location_service.hasUser(user)) { - LOG.info("user "+user+" not found"); + LOG.info("user {} not found", user); return targets; } @@ -171,12 +171,12 @@ protected Vector getTargets(SipMessage msg) { String contact= e.nextElement(); if (location_service.isUserContactExpired(user,contact)) { location_service.removeUserContact(user,contact); - LOG.trace("target"+i+" expired: contact URI removed"); + LOG.trace("target {} expired: contact URI removed", i); } // otherwise add the URI to the target list else { targets.addElement(contact); - LOG.trace("target"+i+"="+targets.elementAt(i)); + LOG.trace("target {}={}", i, targets.elementAt(i)); } } // for SIPS request-uri remove non-SIPS targets @@ -184,7 +184,7 @@ protected Vector getTargets(SipMessage msg) { for (int i=0; i0) { Date exp_date=new Date(System.currentTimeMillis()+((long)exp_secs)*1000); location_service.addUserContact(user,name_address,exp_date); //DateFormat df=new SimpleDateFormat("EEE, dd MMM yyyy hh:mm:ss 'GMT'",Locale.ITALIAN); //printLog("contact added: "+uri+"; expire: "+df.format(location_service.getUserContactExpire(user,url)),LogWriter.LEVEL_LOW); - LOG.trace("contact added: "+contact+"; expire: "+DateFormat.formatEEEddMMMyyyyhhmmss(location_service.getUserContactExpirationDate(user,contact))); + LOG.trace("contact added: {}; expire: {}", contact, DateFormat.formatEEEddMMMyyyyhhmmss(location_service.getUserContactExpirationDate(user,contact))); } ContactHeader ch_i=new ContactHeader(name_address.getAddress()); ch_i.setExpires(exp_secs); @@ -304,7 +304,7 @@ protected SipMessage updateRegistration(SipMessage msg) { if (exp_secs_i>0) { Date exp_date=new Date(System.currentTimeMillis()+((long)exp_secs)*1000); location_service.addUserContact(user,name_address,exp_date); - LOG.info("registration of user "+user+" updated"); + LOG.info("registration of user '{}' updated", user); } ch_i.setExpires(exp_secs_i); resp_contacts.addElement(ch_i); diff --git a/mjsip-server/src/main/java/org/mjsip/server/ServerEngine.java b/mjsip-server/src/main/java/org/mjsip/server/ServerEngine.java index d49ca40..e430906 100644 --- a/mjsip-server/src/main/java/org/mjsip/server/ServerEngine.java +++ b/mjsip-server/src/main/java/org/mjsip/server/ServerEngine.java @@ -125,7 +125,7 @@ public ServerEngine(SipProvider provider, ServerProfile profile) { sip_provider.addSelectiveListener(SipId.ANY_METHOD,this); // LOCAL DOMAINS - LOG.info("Domains="+getLocalDomains()); + LOG.info("Domains={}", getLocalDomains()); // LOCATION SERVICE String location_service_class=profile.locationService; @@ -140,12 +140,12 @@ public ServerEngine(SipProvider provider, ServerProfile profile) { location_service=(LocationService)constructor.newInstance(parameters); } catch (NoSuchMethodException e) { - LOG.debug("Exception." + e); + LOG.debug("Exception.", e); location_service=(LocationService)myclass.newInstance(); } } catch (Exception e) { - LOG.info("Error trying to use location service '" + location_service_class + "': use default class.", e); + LOG.info("Error trying to use location service '{}': use default class.", location_service_class, e); } // use default location service if (location_service==null) location_service=new LocationServiceImpl(profile.locationDb); @@ -159,7 +159,7 @@ public ServerEngine(SipProvider provider, ServerProfile profile) { } } location_service.sync(); - LOG.debug("LocationService \""+profile.locationDb+"\": cleaned\r\n"); + LOG.debug("LocationService \"{}\": cleaned\r\n", profile.locationDb); } else { // remove all expired contacts @@ -175,8 +175,7 @@ public ServerEngine(SipProvider provider, ServerProfile profile) { } if (changed) location_service.sync(); } - LOG.debug("LocationService ("+profile.authenticationService+"): size="+location_service.size()+"\r\n"+location_service.toString()); - LOG.debug("LocationService ("+profile.authenticationService+"): size="+location_service.size()+"\r\n"+location_service.toString()); + LOG.debug("LocationService ({}): size={}\r\n{}",profile.authenticationService, location_service.size(), location_service); // AUTHENTICATION SERVICE if (server_profile.doAuthentication || server_profile.doProxyAuthentication) { @@ -194,17 +193,16 @@ public ServerEngine(SipProvider provider, ServerProfile profile) { authentication_service=(AuthenticationService)constructor.newInstance(parameters); } catch (NoSuchMethodException e) { - LOG.debug("Exception." + e); + LOG.debug("Exception.", e); authentication_service=(AuthenticationService)myclass.newInstance(); } } catch (Exception e) { - LOG.info("Error trying to use authentication service '" + authentication_service_class - + "': use default class.", e); + LOG.info("Error trying to use authentication service '{}': use default class.", authentication_service_class, e); } // use default authentication service if (authentication_service==null) authentication_service=new AuthenticationServiceImpl(server_profile.authenticationDb); - LOG.debug("AuthenticationService ("+profile.authenticationService+"): size="+authentication_service.size()+"\r\n"+authentication_service.toString()); + LOG.debug("AuthenticationService ({}): size={}\r\n{}", profile.authenticationService, authentication_service.size(), authentication_service.toString()); // now, init the proper authentication server String authentication_server_class=profile.authenticationScheme; @@ -219,19 +217,18 @@ public ServerEngine(SipProvider provider, ServerProfile profile) { as=(AuthenticationServer)constructor.newInstance(parameters); } catch (NoSuchMethodException e) { - LOG.debug("Exception." + e); + LOG.debug("Exception.", e); as=(AuthenticationServer)myclass.newInstance(); } } catch (Exception e) { - LOG.warn("Error trying to use authentication server '" + authentication_server_class - + "': use default class.", 1); + LOG.warn("Error trying to use authentication server '{}': use default class.",authentication_server_class, e); } // use default authentication service if (as == null) as = new AuthenticationServerImpl(sip_provider, realm, authentication_service); - LOG.debug("AuthenticationServer: scheme: "+profile.authenticationScheme); - LOG.debug("AuthenticationServer: realm: "+profile.authenticationRealm); + LOG.debug("AuthenticationServer: scheme: {}", profile.authenticationScheme); + LOG.debug("AuthenticationServer: realm: {}", profile.authenticationRealm); } else as=null; @@ -288,7 +285,7 @@ public void onReceivedMessage(SipProvider provider, SipMessage msg) { // update the target target=msg.getRequestLine().getAddress(); - LOG.trace("new recipient: "+target.toString()); + LOG.trace("new recipient: {}", target); // check again if this server is the target //this_is_target=matchesDomainName(target.getHost(),target.getPort()); @@ -312,7 +309,7 @@ public void onReceivedMessage(SipProvider provider, SipMessage msg) { // check whether the request is coming from a user belonging to a domain the server is responsible for boolean is_from_this_domain=isResponsibleFor(msg.getFromHeader().getNameAddress().getAddress()); - LOG.trace("is from local doamin? "+((is_from_this_domain)?"yes":"no")); + LOG.trace("is from local doamin? {}", is_from_this_domain); if (is_for_this_domain && (target.isSipURI() && !target.toSipURI().hasUserName())) { LOG.trace("the recipient is this server"); @@ -494,7 +491,7 @@ protected SipMessage validateRequest(SipMessage msg) { // Proxy-Authorization if (err_code>0) { - LOG.info("Message validation failed ("+err_code+" "+SipResponses.reasonOf(err_code)+"), message discarded"); + LOG.info("Message validation failed ({} {}), message discarded", err_code, SipResponses.reasonOf(err_code)); return sip_provider.messageFactory().createResponse(msg,err_code,null,null); } else return null; diff --git a/mjsip-server/src/main/java/org/mjsip/server/StatefulProxy.java b/mjsip-server/src/main/java/org/mjsip/server/StatefulProxy.java index c2e5fe5..84f5f0e 100644 --- a/mjsip-server/src/main/java/org/mjsip/server/StatefulProxy.java +++ b/mjsip-server/src/main/java/org/mjsip/server/StatefulProxy.java @@ -147,7 +147,7 @@ public void processRequestToLocalUser(SipMessage msg) { return; } - LOG.debug("message will be forwarded to "+targets.size()+" user's contact(s)"); + LOG.debug("message will be forwarded to {} user's contact(s)", targets.size()); for (int i=0; i i=clients.iterator(); i.hasNext(); ) { Transaction tc= i.next(); @@ -296,12 +296,12 @@ protected void processSuccessResponse(TransactionClient transaction, SipMessage canc_counter++; } } - LOG.trace("Cancelled "+canc_counter+" clients in \"proceeding\" state"); + LOG.trace("Cancelled {} clients in \"proceeding\" state", canc_counter); } state.removeServer(ts); } - LOG.trace("t_clients still active: "+state.numOfClients()); - LOG.trace("t_servers still active: "+state.numOfServers()); + LOG.trace("t_clients still active: {}", state.numOfClients()); + LOG.trace("t_servers still active: {}", state.numOfServers()); } @@ -322,8 +322,8 @@ protected void processTimeout(TransactionClient transaction) { else ts.terminate(); state.removeServer(ts); } - LOG.trace("t_clients still active: "+state.numOfClients()); - LOG.trace("t_servers still active: "+state.numOfClients()); + LOG.trace("t_clients still active: {}", state.numOfClients()); + LOG.trace("t_servers still active: {}", state.numOfServers()); } // ******************* TransactionClient callback methods ******************* diff --git a/mjsip-server/src/main/java/org/mjsip/server/sbc/AddressResolver.java b/mjsip-server/src/main/java/org/mjsip/server/sbc/AddressResolver.java index 245613f..0cf25dd 100644 --- a/mjsip-server/src/main/java/org/mjsip/server/sbc/AddressResolver.java +++ b/mjsip-server/src/main/java/org/mjsip/server/sbc/AddressResolver.java @@ -107,19 +107,19 @@ public void updateBinding(SocketAddress refer_soaddr, SocketAddress actual_soadd long expire= new Date().getTime() + expire_time; if (binding_table.containsKey(key)) { if (!binding_table.get(key).equals(actual_soaddr)) { - LOG.info("change BINDING "+refer_soaddr+" >> "+actual_soaddr); + LOG.info("change BINDING {} >> {}", refer_soaddr, actual_soaddr); binding_table.remove(key); binding_table.put(key,actual_soaddr); } else { - LOG.debug("update BINDING "+refer_soaddr+" >> "+actual_soaddr); + LOG.debug("update BINDING {} >> {}", refer_soaddr, actual_soaddr); // do not change binding_table } time_table.remove(key); time_table.put(key,expire); } else { - LOG.info("add BINDING "+refer_soaddr+" >> "+actual_soaddr); + LOG.info("add BINDING {} >> {}", refer_soaddr, actual_soaddr); binding_table.put(key,actual_soaddr); time_table.put(key,expire); } @@ -132,7 +132,7 @@ public void removeBinding(SocketAddress refer_soaddr) { if (refer_soaddr!=null) { String key=refer_soaddr.toString(); if (binding_table.containsKey(key)) { - LOG.info("remove BINDING for "+refer_soaddr); + LOG.info("remove BINDING for {}", refer_soaddr); binding_table.remove(key); time_table.remove(key); } @@ -164,7 +164,7 @@ protected void onTimeout() { // remove expired binding for (int i=0; i> "+dest_soaddr); + LOG.info("CHANGING DESTINATION {} >> {}", refer_soaddr, dest_soaddr); dest_addr=dest_soaddr.getAddress().toString(); dest_port=dest_soaddr.getPort(); } else { - LOG.info("destination unchanged: "+dest_soaddr); + LOG.info("destination unchanged: {}", dest_soaddr); } return super.sendRawMessage(msg,proto,dest_addr,dest_port,ttl); diff --git a/mjsip-server/src/main/java/org/mjsip/server/sbc/InterceptingUdpRelay.java b/mjsip-server/src/main/java/org/mjsip/server/sbc/InterceptingUdpRelay.java index d6f2933..11831b5 100644 --- a/mjsip-server/src/main/java/org/mjsip/server/sbc/InterceptingUdpRelay.java +++ b/mjsip-server/src/main/java/org/mjsip/server/sbc/InterceptingUdpRelay.java @@ -66,10 +66,10 @@ public InterceptingUdpRelay(Scheduler scheduler, int left_port, SocketAddress le try { left_intercept_udp=new UdpProvider(new UdpSocket(left_intercept_port),0,this); - LOG.info("intercept udp interface: "+left_intercept_udp.toString()+" started"); + LOG.info("intercept udp interface: {} started", left_intercept_udp); right_intercept_udp=new UdpProvider(new UdpSocket(right_intercept_port),0,this); - LOG.info("intercept udp interface: "+right_intercept_udp.toString()+" started"); + LOG.info("intercept udp interface: {} started", right_intercept_udp); } catch (Exception e) { LOG.info("Exception.", e); @@ -136,7 +136,7 @@ public void onReceivedPacket(UdpProvider udp_service, UdpPacket packet) { @Override public void onServiceTerminated(UdpProvider udp_service, Exception error) { if (udp_service==left_intercept_udp || udp_service==right_intercept_udp) { - LOG.info("udp interface: "+udp_service.toString()+" terminated"); + LOG.info("udp interface: {} terminated", udp_service); udp_service.getUdpSocket().close(); } else { diff --git a/mjsip-server/src/main/java/org/mjsip/server/sbc/MediaGw.java b/mjsip-server/src/main/java/org/mjsip/server/sbc/MediaGw.java index 9117670..a27b59b 100644 --- a/mjsip-server/src/main/java/org/mjsip/server/sbc/MediaGw.java +++ b/mjsip-server/src/main/java/org/mjsip/server/sbc/MediaGw.java @@ -118,7 +118,7 @@ public SipMessage processSessionDescriptor(SipMessage msg) { int dest_port=mediaField.getPort(); String key=call_id+"-"+leg+"-"+mediaTypes[i]; - LOG.info("media-id: "+key); + LOG.info("media-id: {}", key); if (masq_table.containsKey(key)) { // get masq Masquerade masq=masq_table.get(key); @@ -133,7 +133,9 @@ public SipMessage processSessionDescriptor(SipMessage msg) { } } // mangle sdp - for (int i=0; i0) { // symmetric regulated UDP relay symm_relay = new SymmetricRegulatedUdpRelay(scheduler(), left_port, masq_left.getPeerSoaddr(), right_port, masq_right.getPeerSoaddr(), sbc_profile.relayTimeout, sbc_profile.interpacketTime, this); - LOG.debug("MGW started: "+symm_relay); + LOG.debug("MGW started: {}", symm_relay); } else { // simple symmetric UDP relay symm_relay = new SymmetricUdpRelay(scheduler(), left_port, masq_left.getPeerSoaddr(), right_port, masq_right.getPeerSoaddr(), sbc_profile.relayTimeout, this); - LOG.debug("MGW started: "+symm_relay); + LOG.debug("MGW started: {}", symm_relay); } return symm_relay; @@ -208,33 +210,33 @@ protected SymmetricUdpRelay createSymmetricUdpRelay(Masquerade masq_left, Masque /** When left peer address changes. */ @Override public void onSymmetricUdpRelayLeftPeerChanged(SymmetricUdpRelay symm_relay, SocketAddress soaddr) { - LOG.info("change left peer soaddr "+soaddr); + LOG.info("change left peer soaddr {}", soaddr); // handover? long htime=sbc_profile.handoverTime; if (htime>0 && (System.currentTimeMillis()+htime)0 && (System.currentTimeMillis()+htime) " + remote_soaddr); + LOG.info("Created RTP stream sender: {} --> {}", src_socket, remote_soaddr); } /** Gets the local port. */ @@ -299,9 +299,9 @@ public void run() { long next_report_time=0; if (DEBUG) - LOG.debug("RTP: localhost:"+rtp_socket.getUdpSocket().getLocalPort()+" --> "+remote_soaddr); + LOG.debug("RTP: localhost:{} --> {}", rtp_socket.getUdpSocket().getLocalPort(), remote_soaddr); if (DEBUG) - LOG.debug("RTP: sending pkts of "+(formatted_len)+" bytes of RTP payload"); + LOG.debug("RTP: sending pkts of {} bytes of RTP payload", formatted_len); // DEBUG DROP RATE int debug_drop_count=0; diff --git a/mjsip-sip/src/main/java/org/mjsip/media/rx/AudioFileReceiver.java b/mjsip-sip/src/main/java/org/mjsip/media/rx/AudioFileReceiver.java index 4edbb7f..0f73eb7 100644 --- a/mjsip-sip/src/main/java/org/mjsip/media/rx/AudioFileReceiver.java +++ b/mjsip-sip/src/main/java/org/mjsip/media/rx/AudioFileReceiver.java @@ -39,7 +39,7 @@ public AudioRxHandle createReceiver(RtpReceiverOptions options, UdpSocket socket CodecType codec, int payload_type, RtpPayloadFormat payloadFormat, int sample_rate, int channels, Encoder additional_decoder, RtpStreamReceiverListener listener) throws IOException, UnsupportedAudioFileException { - LOG.info("Storing audio stream to file " + _audioFile + " format: " + audio_format); + LOG.info("Storing audio stream to file {} format: {}", _audioFile, audio_format); OutputStream output_stream = AudioFile.getAudioFileOutputStream(_audioFile, audio_format); RtpStreamReceiver receiver = new RtpStreamReceiver(options, output_stream, additional_decoder, payloadFormat, socket, listener) { @@ -50,7 +50,7 @@ protected void onRtpStreamReceiverTerminated(Exception error) { try { output_stream.close(); } catch (IOException ex) { - LOG.error("Closing audio stream failed: " + _audioFile, ex); + LOG.error("Closing audio stream failed: {}", _audioFile, ex); } } }; diff --git a/mjsip-sip/src/main/java/org/mjsip/media/rx/JavaxAudioOutput.java b/mjsip-sip/src/main/java/org/mjsip/media/rx/JavaxAudioOutput.java index 3485741..8c3503f 100644 --- a/mjsip-sip/src/main/java/org/mjsip/media/rx/JavaxAudioOutput.java +++ b/mjsip-sip/src/main/java/org/mjsip/media/rx/JavaxAudioOutput.java @@ -61,7 +61,7 @@ public AudioRxHandle createReceiver(RtpReceiverOptions options, UdpSocket socket final AudioFormat baseFormat = SimpleAudioSystem.getBaseAudioFormat(sample_rate, channels); audio_output_stream = ConverterAudioSystem.convertAudioOutputStream(codec, sample_rate, SimpleAudioSystem.getOutputStream(baseFormat)); - LOG.info("recv x-format: " + audio_output_stream.getFormat()); + LOG.info("recv x-format: {}", audio_output_stream.getFormat()); } RtpStreamReceiver receiver = new RtpStreamReceiver(options, audio_output_stream, additional_decoder, payloadFormat, socket, listener); diff --git a/mjsip-sip/src/main/java/org/mjsip/media/tx/AudioFileTransmitter.java b/mjsip-sip/src/main/java/org/mjsip/media/tx/AudioFileTransmitter.java index e332b96..5eb8877 100644 --- a/mjsip-sip/src/main/java/org/mjsip/media/tx/AudioFileTransmitter.java +++ b/mjsip-sip/src/main/java/org/mjsip/media/tx/AudioFileTransmitter.java @@ -41,7 +41,7 @@ public AudioTXHandle createSender(RtpSenderOptions options, UdpSocket udp_socket RtpPayloadFormat payloadFormat, int sample_rate, int channels, Encoder additional_encoder, long packet_time, int packet_size, String remote_addr, int remote_port, RtpStreamSenderListener listener, RtpControl rtpControl) throws IOException { try { - LOG.info("Streaming audio from file " + _audioFile + " format: " + audio_format); + LOG.info("Streaming audio from file {} format: {}", _audioFile, audio_format); AudioInputStream audioIn = AudioFile.getAudioFileInputStream(_audioFile, audio_format); RtpStreamSender sender = new RtpStreamSender(options, audioIn, true, payload_type, payloadFormat, sample_rate, channels, packet_time, packet_size, additional_encoder, udp_socket, remote_addr, remote_port, rtpControl, listener); diff --git a/mjsip-sip/src/main/java/org/mjsip/media/tx/JavaxAudioInput.java b/mjsip-sip/src/main/java/org/mjsip/media/tx/JavaxAudioInput.java index 7179692..5a95693 100644 --- a/mjsip-sip/src/main/java/org/mjsip/media/tx/JavaxAudioInput.java +++ b/mjsip-sip/src/main/java/org/mjsip/media/tx/JavaxAudioInput.java @@ -58,7 +58,7 @@ public AudioTXHandle createSender(RtpSenderOptions options, UdpSocket udp_socket final AudioFormat baseFormat = SimpleAudioSystem.getBaseAudioFormat(sample_rate, channels); AudioInputStream rawInput = SimpleAudioSystem.getInputStream(baseFormat); AudioInputStream converter = ConverterAudioSystem.convertAudioInputStream(codec, sample_rate, rawInput); - LOG.info("send x-format: " + converter.getFormat()); + LOG.info("send x-format: {}", converter.getFormat()); audioIn = converter; } diff --git a/mjsip-sip/src/main/java/org/mjsip/media/tx/ToneTransmitter.java b/mjsip-sip/src/main/java/org/mjsip/media/tx/ToneTransmitter.java index faba091..ac26af3 100644 --- a/mjsip-sip/src/main/java/org/mjsip/media/tx/ToneTransmitter.java +++ b/mjsip-sip/src/main/java/org/mjsip/media/tx/ToneTransmitter.java @@ -61,7 +61,7 @@ public AudioTXHandle createSender(RtpSenderOptions options, UdpSocket udp_socket CodecType codec, int payload_type, RtpPayloadFormat payloadFormat, int sample_rate, int channels, Encoder additional_encoder, long packet_time, int packet_size, String remote_addr, int remote_port, RtpStreamSenderListener listener, RtpControl rtpControl) throws IOException { - LOG.info("Tone generator: " + _toneFreq + " Hz"); + LOG.info("Tone generator: {} Hz", _toneFreq); ToneInputStream audioIn = new ToneInputStream(_toneFreq, _toneAmpl, sample_rate, TONE_SAMPLE_SIZE, ToneGenerator.Encoding.PCM_LINEAR_UNSIGNED, DEFAULT_BIG_ENDIAN); RtpStreamSender sender = new RtpStreamSender(options, audioIn, true, payload_type, payloadFormat, diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/call/Call.java b/mjsip-sip/src/main/java/org/mjsip/sip/call/Call.java index 17ff4f3..586087f 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/call/Call.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/call/Call.java @@ -132,7 +132,7 @@ public CallState getState() { * @param state the new state value */ protected void changeState(int state) { call_state.setState(state); - LOG.debug("changed call state: "+call_state.toString()); + LOG.debug("changed call state: {}", call_state); } /** Gets the current invite dialog. */ @@ -188,7 +188,7 @@ public void call(NameAddress callee, SdpMessage sdp) { * @param caller the caller address * @param sdp the session descriptor */ public void call(NameAddress callee, NameAddress caller, SdpMessage sdp) { - LOG.debug("calling "+callee); + LOG.debug("calling {}", callee); dialog=new InviteDialog(sip_provider,dialogListener); if (caller==null) caller=from_naddr; GenericURI calleeAddress = callee.getAddress(); diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/call/CancelServer.java b/mjsip-sip/src/main/java/org/mjsip/sip/call/CancelServer.java index e541b6c..d8b67d4 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/call/CancelServer.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/call/CancelServer.java @@ -66,8 +66,7 @@ public void halt() { public void onReceivedMessage(SipProvider sip_provider, SipMessage msg) { // respond to CANCEL request if (msg.isRequest() && msg.isCancel()) { - LOG.info( - "CancelServer: " + "responding to CANCEL request with 481 \"Call Leg/Transaction Does Not Exist\""); + LOG.info("CancelServer: responding to CANCEL request with 481 \"Call Leg/Transaction Does Not Exist\""); SipMessage resp = sip_provider.messageFactory().createResponse(msg, SipResponses.CALL_TRANSACTION_DOES_NOT_EXIST, null, null); TransactionServer ts=new TransactionServer(sip_provider,msg,null); diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/call/ExtendedCall.java b/mjsip-sip/src/main/java/org/mjsip/sip/call/ExtendedCall.java index f6cd4de..7536833 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/call/ExtendedCall.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/call/ExtendedCall.java @@ -119,7 +119,7 @@ public void listen() { * @param sdp the session descriptor */ @Override public void call(NameAddress callee, NameAddress caller, SdpMessage sdp) { - LOG.debug("calling "+callee); + LOG.debug("calling {}", callee); if (username!=null) dialog=new ExtendedInviteDialog(sip_provider,username,realm,passwd,dialogListener); else dialog=new ExtendedInviteDialog(sip_provider,dialogListener); if (caller==null) caller=from_naddr; @@ -181,7 +181,7 @@ public void notify(int code, String reason) { /** From ExtendedInviteDialogListener. When an incoming REFER request is received within the dialog */ private void processDlgRefer(org.mjsip.sip.dialog.InviteDialog d, NameAddress refer_to, NameAddress referred_by, SipMessage msg) { if (d!=dialog) { LOG.info("NOT the current dialog"); return; } - LOG.trace("onDlgRefer("+refer_to.toString()+")"); + LOG.trace("onDlgRefer({})", refer_to); refer=msg; if (xcall_listener!=null) { String replcall_id=null; @@ -194,7 +194,7 @@ private void processDlgRefer(org.mjsip.sip.dialog.InviteDialog d, NameAddress re /** From ExtendedInviteDialogListener. When a response is received for a REFER request within the dialog */ private void processDlgReferResponse(org.mjsip.sip.dialog.InviteDialog d, int code, String reason, SipMessage msg) { if (d!=dialog) { LOG.info("NOT the current dialog"); return; } - LOG.trace("onDlgReferResponse("+code+" "+reason+")"); + LOG.trace("onDlgReferResponse({} {})", code, reason); if (code>=200 && code <300) { if(xcall_listener!=null) xcall_listener.onCallTransferAccepted(this,msg); } @@ -210,7 +210,7 @@ private void processDlgNotify(org.mjsip.sip.dialog.InviteDialog d, String event, LOG.trace("onDlgNotify()"); if (event.equals("refer")) { SipMessage fragment=new SipMessage(sipfragment); - LOG.info("Notify: "+sipfragment); + LOG.info("Notify: {}", sipfragment); if (fragment.isResponse()) { StatusLine status_line=fragment.getStatusLine(); int code=status_line.getCode(); diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/call/NotImplementedServer.java b/mjsip-sip/src/main/java/org/mjsip/sip/call/NotImplementedServer.java index 92eb54f..21c4fad 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/call/NotImplementedServer.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/call/NotImplementedServer.java @@ -87,7 +87,7 @@ public void onReceivedMessage(SipProvider sip_provider, SipMessage msg) { for (int i=0; imsg message using the specified transport connection. */ /* - * public ConnectionId sendMessage(SipMessage msg, ConnectionId conn_id) { if (log_all_packets - * || msg.getLength()>MIN_MESSAGE_LENGTH) LOG.info("Sending message through conn "+conn_id); - * LOG.trace("message to send:."+MESSAGE_BEGIN_DELIMITER+msg.toString()+MESSAGE_END_DELIMITER); - * SipTransportConnection conn=null; for (Enumeration e=sip_transports.elements(); - * e.hasMoreElements() && conn==null; ) { SipTransport transp=(SipTransport)e.nextElement(); if - * (isReliableTransport(transp)) conn=((SipTransportCO)transp).sendMessage(msg,conn_id); } if - * (conn!=null) { // logs String proto=conn.getProtocol(); - * LOG.debug("SipProvider: sendMessage(msg,conn): conn: "+conn); - * LOG.debug("SipProvider: sendMessage(msg,conn): remote_addr: "+conn.getRemoteAddress()); - * String dest_addr=conn.getRemoteAddress().toString(); int dest_port=conn.getRemotePort(); + * public ConnectionId sendMessage(SipMessage msg, ConnectionId conn_id) { if + * (log_all_packets || msg.getLength()>MIN_MESSAGE_LENGTH) + * LOG.info("Sending message through conn "+conn_id); + * LOG.trace("message to send:."+MESSAGE_BEGIN_DELIMITER+msg.toString()+ + * MESSAGE_END_DELIMITER); SipTransportConnection conn=null; for (Enumeration + * e=sip_transports.elements(); e.hasMoreElements() && conn==null; ) { + * SipTransport transp=(SipTransport)e.nextElement(); if + * (isReliableTransport(transp)) + * conn=((SipTransportCO)transp).sendMessage(msg,conn_id); } if (conn!=null) { + * // logs String proto=conn.getProtocol(); + * LOG.debug("SipProvider: sendMessage(msg,conn): conn: {}", conn); + * LOG.debug("SipProvider: sendMessage(msg,conn): remote_addr: {}", + * conn.getRemoteAddress()); String + * dest_addr=conn.getRemoteAddress().toString(); int + * dest_port=conn.getRemotePort(); * logMessage(proto,dest_addr,dest_port,msg.getLength(),msg,"sent"); * * return new ConnectionId(conn); } else { return sendMessage(msg); } } diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/provider/SipTransportCO.java b/mjsip-sip/src/main/java/org/mjsip/sip/provider/SipTransportCO.java index 0a363cd..06d6d19 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/provider/SipTransportCO.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/provider/SipTransportCO.java @@ -143,26 +143,26 @@ public ConnectionId sendMessage(SipMessage msg, IpAddress dest_ipaddr, int dest_ if (connections.containsKey(connection_id)) try { - LOG.debug("already active connection found for connection-id "+connection_id); + LOG.debug("already active connection found for connection-id {}", connection_id); SipTransportConnection conn=connections.get(connection_id); - LOG.debug("sending data through already active connection "+conn); + LOG.debug("sending data through already active connection {}", conn); //conn.sendMessage(msg); sendMessage(conn,msg); return connection_id; } catch (Exception e) { - LOG.warn("error using previous connection with connection-id " + connection_id, e); + LOG.warn("error using previous connection with connection-id {}", connection_id, e); removeConnection(connection_id); } // no active connection - LOG.debug("no active connection for "+connection_id); + LOG.debug("no active connection for {}", connection_id); if (!manual) { // AUTOMATIC CONN MODE - LOG.debug("open "+getProtocol()+" connection to "+dest_ipaddr+":"+dest_port); + LOG.debug("open " + getProtocol() + " connection to {}:{}", dest_ipaddr, dest_port); try { SipTransportConnection conn=addConnection(dest_ipaddr,dest_port); if (conn!=null) { - LOG.debug("sending data through connection "+conn); + LOG.debug("sending data through connection {}", conn); //conn.sendMessage(msg); sendMessage(conn,msg); return new ConnectionId(conn); @@ -173,7 +173,7 @@ public ConnectionId sendMessage(SipMessage msg, IpAddress dest_ipaddr, int dest_ } } catch (Exception e) { - LOG.warn("Exception: " + e); + LOG.warn("Exception", e); return null; } } @@ -204,7 +204,7 @@ public SipTransportConnection sendMessageCO(SipMessage msg) throws IOException throw new IOException("no active connection found matching connection-id "+connection_id); } // else - LOG.debug("active connection found matching "+connection_id); + LOG.debug("active connection found matching {}", connection_id); SipTransportConnection conn=connections.get(connection_id); //conn.sendMessage(msg); sendMessage(conn,msg); @@ -253,7 +253,7 @@ protected void processConnectionTerminated(SipTransportConnection conn, Exceptio //System.out.println("DEBUG: SipTransportCO: connection terminated"); ConnectionId connection_id=new ConnectionId(conn); removeConnection(connection_id); - LOG.debug("connection " + conn + " terminated", error); + LOG.debug("connection {} terminated", conn, error); if (listener!=null) listener.onTransportConnectionTerminated(this,new SocketAddress(conn.getRemoteAddress(),conn.getRemotePort()),error); } @@ -262,7 +262,7 @@ protected void processConnectionTerminated(SipTransportConnection conn, Exceptio public SipTransportConnection addConnection(IpAddress remote_ipaddr, int remote_port) throws IOException { SipTransportConnection conn=createTransportConnection(new SocketAddress(remote_ipaddr,remote_port)); if (conn!=null) { - LOG.debug("connection " + conn + " opened"); + LOG.debug("connection {} opened", conn); addConnection(conn); } else @@ -279,7 +279,7 @@ public void addConnection(SipTransportConnection conn) { if (connections.containsKey(connection_id)) { // remove the previous connection - LOG.info("Adding already established connection, replacing ID: " + connection_id); + LOG.info("Adding already established connection, replacing ID: {}", connection_id); SipTransportConnection old_conn=connections.get(connection_id); old_conn.halt(); connections.remove(connection_id); @@ -305,7 +305,7 @@ public void addConnection(SipTransportConnection conn) { LOG.trace("active connenctions:"); for (Map.Entry e : connections.entrySet() ) { ConnectionId id= e.getKey(); - LOG.trace("connection-id="+id+": "+(e.getValue()).toString()); + LOG.trace("connection-id={}:{}", id, e.getValue()); } } } @@ -327,7 +327,7 @@ public void removeConnection(ConnectionId connection_id) { LOG.trace("active connenctions:"); for (Enumeration e=connections.elements(); e.hasMoreElements(); ) { SipTransportConnection co= e.nextElement(); - LOG.trace("conn "+co.toString()); + LOG.trace("conn {}", co); } } } diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/provider/TcpTransport.java b/mjsip-sip/src/main/java/org/mjsip/sip/provider/TcpTransport.java index 34d9ac4..fbe1709 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/provider/TcpTransport.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/provider/TcpTransport.java @@ -110,17 +110,17 @@ public void halt() { /** When a new incoming connection is established */ private void processIncomingConnection(TcpServer tcp_server, TcpSocket socket) { - LOG.debug("incoming connection from "+socket.getAddress()+":"+socket.getPort()); + LOG.debug("incoming connection from {}:{}", socket.getAddress(), socket.getPort()); if (tcp_server==this.tcp_server) { try { SipTransportConnection conn = new TcpTransportConnection(socket, this_conn_listener); - LOG.debug("tcp connection " + conn + " opened"); + LOG.debug("tcp connection {} opened", conn); addConnection(conn); if (listener != null) listener.onIncomingTransportConnection(this, new SocketAddress(socket.getAddress(), socket.getPort())); } catch (IOException ex) { - LOG.info("Handling incoming connection failed: " + ex.getMessage()); + LOG.info("Handling incoming connection failed: {}", ex.getMessage()); } } } @@ -128,7 +128,7 @@ private void processIncomingConnection(TcpServer tcp_server, TcpSocket socket) { /** From TcpServerListener. When TcpServer terminates. */ private void processServerTerminated(TcpServer tcp_server, Exception error) { - LOG.debug("tcp server "+tcp_server+" terminated"); + LOG.debug("tcp server {} terminated", tcp_server); } diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/provider/TcpTransportConnection.java b/mjsip-sip/src/main/java/org/mjsip/sip/provider/TcpTransportConnection.java index e66de6a..4002a0b 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/provider/TcpTransportConnection.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/provider/TcpTransportConnection.java @@ -198,7 +198,7 @@ public String toString() { /** When new data is received through the TcpConnection. */ private void processReceivedData(TcpConnection tcp_conn, byte[] data, int len) { - LOG.debug("Received " + len + " bytes of data."); + LOG.debug("Received {} bytes of data.", len); last_time=System.currentTimeMillis(); buffer.append(data,0,len); diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/provider/TlsTransport.java b/mjsip-sip/src/main/java/org/mjsip/sip/provider/TlsTransport.java index e4e3e2b..0167f48 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/provider/TlsTransport.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/provider/TlsTransport.java @@ -141,7 +141,7 @@ public void onServerTerminated(TcpServer tcp_server, Exception error) { // String[] ep=tls_socket_factory.getEnabledProtocols(); // String[] sp={ ep[ep.length-1] }; // tls_socket_factory.setEnabledProtocols(sp); - // LOG.debug("enabled protocols: "+sp[0]); + // LOG.debug("enabled protocols: {}", sp[0]); } catch (Exception e) { e.printStackTrace(); @@ -175,17 +175,17 @@ public void halt() { /** From TcpServerListener. When a new incoming connection is established */ private void processIncomingConnection(TcpServer tcp_server, TcpSocket socket) { - LOG.debug("incoming connection from "+socket.getAddress()+":"+socket.getPort()); + LOG.debug("incoming connection from {}:{}", socket.getAddress(), socket.getPort()); if (tcp_server==this.tls_server) { try { SipTransportConnection conn = new TlsTransportConnection(socket, this_conn_listener); - LOG.debug("tls connection " + conn + " opened"); + LOG.debug("tls connection {} opened", conn); addConnection(conn); if (listener != null) listener.onIncomingTransportConnection(this, new SocketAddress(socket.getAddress(), socket.getPort())); } catch (IOException ex) { - LOG.info("Handling incoming connection failed: " + ex.getMessage()); + LOG.info("Handling incoming connection failed: {}", ex.getMessage()); } } } @@ -193,7 +193,7 @@ private void processIncomingConnection(TcpServer tcp_server, TcpSocket socket) { /** From TcpServerListener. When TcpServer terminates. */ private void processServerTerminated(TcpServer tcp_server, Exception error) { - LOG.debug("tls server "+tcp_server+" terminated"); + LOG.debug("tls server {} terminated", tcp_server); } diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/AckTransactionServer.java b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/AckTransactionServer.java index 9e705bd..765a2ec 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/AckTransactionServer.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/AckTransactionServer.java @@ -98,7 +98,7 @@ public AckTransactionServer(SipProvider sip_provider, ConnectionId connection_id //{ retransmission_to=new Timer(retransmission_to.getTime(),this); // retransmission_to.start(); //} - LOG.info("new transaction-id: "+transaction_id.toString()); + LOG.info("new transaction-id: {}", transaction_id); } /** Starts the AckTransactionServer. */ @@ -133,7 +133,8 @@ public void onReceivedMessage(SipProvider sip_provider, SipMessage msg) { if (transaction_listener!=null) transaction_listener.onTransAck(this,msg); transaction_listener=null; }*/ - else LOG.warn(msg.getRequestLine().getMethod()+" method erroneously passed to this trasaction"); + else + LOG.warn("{} method erroneously passed to this trasaction", msg.getRequestLine().getMethod()); } } diff --git a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/TransactionClient.java b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/TransactionClient.java index 9ed4946..26dd327 100644 --- a/mjsip-sip/src/main/java/org/mjsip/sip/transaction/TransactionClient.java +++ b/mjsip-sip/src/main/java/org/mjsip/sip/transaction/TransactionClient.java @@ -75,7 +75,7 @@ public TransactionClient(SipProvider sip_provider, SipMessage req, TransactionCl void init(TransactionClientListener listener, SipId transaction_id) { this.transaction_listener=listener; this.transaction_id=transaction_id; - LOG.debug("new transaction-id: " + transaction_id.toString()); + LOG.debug("new transaction-id: {}", transaction_id); } @@ -158,7 +158,7 @@ protected final void scheduleRetransmission(long timeout) { private void startTransactionTimeout() { long timeout = sip_provider.sipConfig().getTransactionTimeout(); - LOG.debug("Starting transaction timeout: " + timeout + "ms"); + LOG.debug("Starting transaction timeout: {}ms", timeout); transaction_to = sip_provider.scheduler().schedule(timeout, this::onTransactionTimeout); } @@ -178,7 +178,7 @@ protected void onTransactionTimeout() { private void startClearingTimeout() { long timeout = sip_provider.sipConfig().getClearingTimeout(); - LOG.debug("Starting clearing timeout: " + timeout + "ms"); + LOG.debug("Starting clearing timeout: {}ms", timeout); clearing_to = sip_provider.scheduler().schedule(timeout, this::onClearingTimeout); } diff --git a/mjsip-sound/src/main/java/org/zoolu/sound/ConvertedAudioOutputStream.java b/mjsip-sound/src/main/java/org/zoolu/sound/ConvertedAudioOutputStream.java index ddd067e..27c6891 100644 --- a/mjsip-sound/src/main/java/org/zoolu/sound/ConvertedAudioOutputStream.java +++ b/mjsip-sound/src/main/java/org/zoolu/sound/ConvertedAudioOutputStream.java @@ -79,10 +79,10 @@ public ConvertedAudioOutputStream(AudioFormat format, AudioOutputStream os, Form } converted_input_stream=converter.getAudioInputStream(final_output_stream.getFormat(),audio_input_stream); - if (DEBUG) - LOG.debug("input codec: "+format); - if (DEBUG) - LOG.debug("output codec: "+final_output_stream.getFormat()); + if (DEBUG) { + LOG.debug("input codec: {}", format); + LOG.debug("output codec: {}", final_output_stream.getFormat()); + } if (converted_input_stream==null) { throw new IOException("Failed while getting a transcoded AudioOuputStream of format:"+format+", for an AudioOuputStream with format: "+final_output_stream.getFormat()+"."); } diff --git a/mjsip-sound/src/main/java/org/zoolu/sound/SimpleAudioSystem.java b/mjsip-sound/src/main/java/org/zoolu/sound/SimpleAudioSystem.java index 681edd2..29fe258 100644 --- a/mjsip-sound/src/main/java/org/zoolu/sound/SimpleAudioSystem.java +++ b/mjsip-sound/src/main/java/org/zoolu/sound/SimpleAudioSystem.java @@ -94,7 +94,7 @@ public static void initAudioInputLine(float sample_rate, int channels) { AudioFormat.Encoding[] codecs=AudioSystem.getTargetEncodings(base_format); String codec_list=""; for (int i=0; i=1 && line_infos[0].getLineClass().equals(TargetDataLine.class)) { - LOG.info("Input: --- TargetDataLine["+i+"]: "+mi.getName()); + LOG.info("Input: --- TargetDataLine[{}]: {}", i, mi.getName()); } } if (line_index>=0) { Mixer m=AudioSystem.getMixer(mixer_infos[line_index]); TargetDataLine target_line=(TargetDataLine)m.getLine(m.getTargetLineInfo()[0]); - LOG.info("Input: --- Selected TargetDataLine #"+line_index+": "+mixer_infos[line_index].getName()); + LOG.info("Input: --- Selected TargetDataLine #{}:{}", line_index, mixer_infos[line_index].getName()); return target_line; } else { @@ -155,7 +155,7 @@ public static void initAudioOutputLine(float sample_rate, int channels) { AudioFormat.Encoding[] codecs=AudioSystem.getTargetEncodings(base_format); String codec_list=""; for (int i=0; i=0)? volume*(linear_max-1)+1 : 1+volume*(1-linear_min); double level=10*Math.log(linear_level)/Math.log(10); - LOG.debug("set clip volume gain (dB): " + level); + LOG.debug("set clip volume gain (dB): {}", level); vc.setValue((float)level); } } @@ -177,7 +177,7 @@ public float getVolumeGain() { FloatControl vc=(FloatControl)clip.getControl(FloatControl.Type.MASTER_GAIN); if(vc!=null) { float level=vc.getValue(); - LOG.debug("get clip volume (dB): " + level); + LOG.debug("get clip volume (dB): {}", level); double linear_max=Math.exp((vc.getMaximum()/10)*Math.log(10)); double linear_min=Math.exp((vc.getMinimum()/10)*Math.log(10)); double linear_level=Math.exp((level/10)*Math.log(10)); diff --git a/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java b/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java index 0d92429..dcb4593 100644 --- a/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java +++ b/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationClient.java @@ -249,9 +249,6 @@ protected void register(int expire_time, String content_type, byte[] body) { } } - // where is the Accept header ? - System.out.printf("XX\nXX\nXX Allowed Methods: %s", req.getAcceptHeader() != null ? req.getAcceptHeader().getParameters() : "n/a" ); - TransactionClient t=new TransactionClient(_sipProvider,req,this); t.request(); } diff --git a/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationLogger.java b/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationLogger.java index 8fa10c3..584b625 100644 --- a/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationLogger.java +++ b/mjsip-ua/src/main/java/org/mjsip/ua/registration/RegistrationLogger.java @@ -16,14 +16,13 @@ public class RegistrationLogger implements RegistrationClientListener { /** When a UA has been successfully (un)registered. */ @Override public void onRegistrationSuccess(RegistrationClient rc, NameAddress target, NameAddress contact, int expires, int renewTime, String result) { - LOG.info("Registration of '" + contact + "' " + result + ", expires in " + expires + "s" - + (renewTime > 0 ? ", renewing in " + renewTime + "s" : "") + "."); + LOG.info("Registration of '{}' {}, expires in {}s {}.", contact, result, expires, (renewTime > 0 ? ", renewing in " + renewTime + "s" : "")); } /** When a UA failed on (un)registering. */ @Override public void onRegistrationFailure(RegistrationClient rc, NameAddress target, NameAddress contact, String result) { - LOG.info("Registration of '" + contact + "' failed: "+result); + LOG.info("Registration of '{}' failed: {}", contact, result); } } diff --git a/mjsip-util/src/main/java/org/zoolu/util/Configure.java b/mjsip-util/src/main/java/org/zoolu/util/Configure.java index 3b1f38e..d6d39a6 100644 --- a/mjsip-util/src/main/java/org/zoolu/util/Configure.java +++ b/mjsip-util/src/main/java/org/zoolu/util/Configure.java @@ -57,7 +57,7 @@ public void loadFile(File file) { readFrom(new FileReader(file)); } catch (Exception e) { - LOG.warn("error reading file \""+file+"\"", e); + LOG.warn("error reading file ({})", file, e); return; } } @@ -72,7 +72,7 @@ public void loadFile(URL url) { readFrom(new InputStreamReader(url.openStream())); } catch (Exception e) { - LOG.warn("error reading from \""+url+"\"", e); + LOG.warn("error reading from ({})", url, e); return; } } From df6d23f8e8e5fddd021b0c76e5d259f032dbaa14 Mon Sep 17 00:00:00 2001 From: Hajo Thelen Date: Thu, 5 Dec 2024 16:52:25 +0100 Subject: [PATCH 5/6] Update UserAgent.java There was a toString I've missed --- mjsip-ua/src/main/java/org/mjsip/ua/UserAgent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mjsip-ua/src/main/java/org/mjsip/ua/UserAgent.java b/mjsip-ua/src/main/java/org/mjsip/ua/UserAgent.java index 38be22e..fe8be88 100644 --- a/mjsip-ua/src/main/java/org/mjsip/ua/UserAgent.java +++ b/mjsip-ua/src/main/java/org/mjsip/ua/UserAgent.java @@ -656,7 +656,7 @@ public void onCallUpdate(ExtendedCall call, SdpMessage sdp, SipMessage update) { public void onCallTransfer(ExtendedCall call, NameAddress refer_to, NameAddress refered_by, SipMessage refer) { LOG.debug("onCallTransfer()"); if (call!=this.call) { LOG.debug("NOT the current call"); return; } - LOG.debug("transfer to {}", refer_to.toString()); + LOG.debug("transfer to {}", refer_to); call.acceptTransfer(); call_transfer=new ExtendedCall(sip_provider,new SipUser(_config.getUserURI()),this); AddressType addressType = ConnectionField.addressType(refer_to.getAddress().getSpecificPart()); From 1b2d831ff09639d9bec951abeeeda090b0e1617e Mon Sep 17 00:00:00 2001 From: Hajo Thelen Date: Thu, 5 Dec 2024 16:54:38 +0100 Subject: [PATCH 6/6] Update UserAgentCli.java another toString I've missed --- .../src/main/java/org/mjsip/examples/UserAgentCli.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mjsip-examples/src/main/java/org/mjsip/examples/UserAgentCli.java b/mjsip-examples/src/main/java/org/mjsip/examples/UserAgentCli.java index 374d500..a82ad0d 100644 --- a/mjsip-examples/src/main/java/org/mjsip/examples/UserAgentCli.java +++ b/mjsip-examples/src/main/java/org/mjsip/examples/UserAgentCli.java @@ -281,7 +281,7 @@ public void onUaIncomingCall(UserAgent ua, NameAddress callee, NameAddress calle } else { changeStatus(UA_INCOMING_CALL); - LOG.info("incoming call from {}", caller.toString()); + LOG.info("incoming call from {}", caller); LOG.info("accept? [yes/no]"); } }