[jitsi-dev] jsip forked?


#1

Dear developers,

We have jain-sip-src-1.2.159.zip and jsip.zip in libsrc.

I confirmed with damencho that jain-sip-src-1.2.159.zip has been
obsoleted so I'm going to delete it.

I'm trying hard to figure out jsip.zip though. It appears to be a SVN
checkout at revision 1829 with the following changes:

! ant-tasks
M build.xml
M src/gov/nist/core/LexerCore.java
M src/gov/nist/javax/sdp/parser/MediaFieldParser.java
M src/gov/nist/javax/sip/Utils.java
M src/gov/nist/javax/sip/header/Protocol.java
M src/gov/nist/javax/sip/parser/Lexer.java
M src/gov/nist/javax/sip/stack/SIPServerTransaction.java
M src/gov/nist/javax/sip/stack/SIPTransactionStack.java

I've changed the following and I know I haven't submitted it upstream:

M src/gov/nist/javax/sdp/parser/MediaFieldParser.java

I believe the following have been committed upstream in revision 2312
(and there are other modifications to the files between revisions 1829
and 2312):

M src/gov/nist/core/LexerCore.java
M src/gov/nist/javax/sip/Utils.java
M src/gov/nist/javax/sip/header/Protocol.java
M src/gov/nist/javax/sip/parser/Lexer.java
M src/gov/nist/javax/sip/stack/SIPTransactionStack.java

I tried to figure out the following but I don't see it in the upstream
repository. There was a file rename though so that may have hindered
my search:

M src/gov/nist/javax/sip/stack/SIPServerTransaction.java

It's an addition on our side or a removal on theirs:

<
< lastReparsedResponse.setRemoteAddress(
< this.getPeerInetAddress());
<
lastReparsedResponse.setRemotePort(this.getPeerPort());
< lastReparsedResponse.setLocalPort(
< getMessageChannel().getPort());
< lastReparsedResponse.setLocalAddress(
< getMessageChannel()
< .getMessageProcessor().getIpAddress());
<
1234,1244d1223
<
< lastReparsedResponse.setRemoteAddress(
< this.getPeerInetAddress());
< lastReparsedResponse.setRemotePort
< (this.getPeerPort());
< lastReparsedResponse.setLocalPort(
< getMessageChannel().getPort());
< lastReparsedResponse.setLocalAddress(
< getMessageChannel()
<
.getMessageProcessor().getIpAddress());
<

The following are not in the upstream repository for sure because they
are commented code and a directory removal:

! ant-tasks
M build.xml

Should I fork the jsip project at SVN revision 1829 in a GitHub
repository of ours and apply our changes there?

Should I try to push my modification of
src/gov/nist/javax/sdp/parser/MediaFieldParser.java upstream?

Best regards,
Lyubo Marinov


#2

Hi,

Dear developers,

We have jain-sip-src-1.2.159.zip and jsip.zip in libsrc.

I confirmed with damencho that jain-sip-src-1.2.159.zip has been
obsoleted so I'm going to delete it.

I'm trying hard to figure out jsip.zip though. It appears to be a SVN
checkout at revision 1829 with the following changes:

! ant-tasks
M build.xml
M src/gov/nist/core/LexerCore.java
M src/gov/nist/javax/sdp/parser/MediaFieldParser.java
M src/gov/nist/javax/sip/Utils.java
M src/gov/nist/javax/sip/header/Protocol.java
M src/gov/nist/javax/sip/parser/Lexer.java
M src/gov/nist/javax/sip/stack/SIPServerTransaction.java
M src/gov/nist/javax/sip/stack/SIPTransactionStack.java

I've changed the following and I know I haven't submitted it upstream:

M src/gov/nist/javax/sdp/parser/MediaFieldParser.java

I believe the following have been committed upstream in revision 2312
(and there are other modifications to the files between revisions 1829
and 2312):

M src/gov/nist/core/LexerCore.java
M src/gov/nist/javax/sip/Utils.java
M src/gov/nist/javax/sip/header/Protocol.java
M src/gov/nist/javax/sip/parser/Lexer.java
M src/gov/nist/javax/sip/stack/SIPTransactionStack.java

I tried to figure out the following but I don't see it in the upstream
repository. There was a file rename though so that may have hindered
my search:

M src/gov/nist/javax/sip/stack/SIPServerTransaction.java

I also need to check it. I have added those due to packet logging and
I think everything was added into upstream.

It's an addition on our side or a removal on theirs:

<
< lastReparsedResponse.setRemoteAddress(
< this.getPeerInetAddress());
<
lastReparsedResponse.setRemotePort(this.getPeerPort());
< lastReparsedResponse.setLocalPort(
< getMessageChannel().getPort());
< lastReparsedResponse.setLocalAddress(
< getMessageChannel()
< .getMessageProcessor().getIpAddress());
<
1234,1244d1223
<
< lastReparsedResponse.setRemoteAddress(
< this.getPeerInetAddress());
< lastReparsedResponse.setRemotePort
< (this.getPeerPort());
< lastReparsedResponse.setLocalPort(
< getMessageChannel().getPort());
< lastReparsedResponse.setLocalAddress(
< getMessageChannel()
<
.getMessageProcessor().getIpAddress());
<

The following are not in the upstream repository for sure because they
are commented code and a directory removal:

! ant-tasks
M build.xml

Well this was my work while doing the debian src package. When we make
it using maven I can change this and for debian src so we can skip
those changes.

Should I fork the jsip project at SVN revision 1829 in a GitHub
repository of ours and apply our changes there?

I think so, and just the source changes.

Should I try to push my modification of
src/gov/nist/javax/sdp/parser/MediaFieldParser.java upstream?

Yes, as I remember it was a bug fix, right?

Regards
damencho

···

On Mon, Jun 22, 2015 at 10:50 PM, Lyubomir Marinov <lyubomir.marinov@jitsi.org> wrote:

Best regards,
Lyubo Marinov

_______________________________________________
dev mailing list
dev@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/dev


#3

Hey

Just a comment: Mobicents already maintains a mirror of jsip on GitHub. It may make more sense to fork their repo and create a branch based on rev. 1829 where we apply our changes.

Btw, this lib hasn't been updated from upstream in a long time. What are the chances we could do that at some point?

Ingo

Freundliche Grüsse,
Ingo Bauersachs

-- sent from my mobile

···

On 23.06.2015, at 11:34, Damian Minkov <damencho@jitsi.org> wrote:

Hi,

On Mon, Jun 22, 2015 at 10:50 PM, Lyubomir Marinov > <lyubomir.marinov@jitsi.org> wrote:

Dear developers,

We have jain-sip-src-1.2.159.zip and jsip.zip in libsrc.

I confirmed with damencho that jain-sip-src-1.2.159.zip has been
obsoleted so I'm going to delete it.

I'm trying hard to figure out jsip.zip though. It appears to be a SVN
checkout at revision 1829 with the following changes:

! ant-tasks
M build.xml
M src/gov/nist/core/LexerCore.java
M src/gov/nist/javax/sdp/parser/MediaFieldParser.java
M src/gov/nist/javax/sip/Utils.java
M src/gov/nist/javax/sip/header/Protocol.java
M src/gov/nist/javax/sip/parser/Lexer.java
M src/gov/nist/javax/sip/stack/SIPServerTransaction.java
M src/gov/nist/javax/sip/stack/SIPTransactionStack.java

I've changed the following and I know I haven't submitted it upstream:

M src/gov/nist/javax/sdp/parser/MediaFieldParser.java

I believe the following have been committed upstream in revision 2312
(and there are other modifications to the files between revisions 1829
and 2312):

M src/gov/nist/core/LexerCore.java
M src/gov/nist/javax/sip/Utils.java
M src/gov/nist/javax/sip/header/Protocol.java
M src/gov/nist/javax/sip/parser/Lexer.java
M src/gov/nist/javax/sip/stack/SIPTransactionStack.java

I tried to figure out the following but I don't see it in the upstream
repository. There was a file rename though so that may have hindered
my search:

M src/gov/nist/javax/sip/stack/SIPServerTransaction.java

I also need to check it. I have added those due to packet logging and
I think everything was added into upstream.

It's an addition on our side or a removal on theirs:

<
< lastReparsedResponse.setRemoteAddress(
< this.getPeerInetAddress());
<
lastReparsedResponse.setRemotePort(this.getPeerPort());
< lastReparsedResponse.setLocalPort(
< getMessageChannel().getPort());
< lastReparsedResponse.setLocalAddress(
< getMessageChannel()
< .getMessageProcessor().getIpAddress());
<
1234,1244d1223
<
< lastReparsedResponse.setRemoteAddress(
< this.getPeerInetAddress());
< lastReparsedResponse.setRemotePort
< (this.getPeerPort());
< lastReparsedResponse.setLocalPort(
< getMessageChannel().getPort());
< lastReparsedResponse.setLocalAddress(
< getMessageChannel()
<
.getMessageProcessor().getIpAddress());
<

The following are not in the upstream repository for sure because they
are commented code and a directory removal:

! ant-tasks
M build.xml

Well this was my work while doing the debian src package. When we make
it using maven I can change this and for debian src so we can skip
those changes.

Should I fork the jsip project at SVN revision 1829 in a GitHub
repository of ours and apply our changes there?

I think so, and just the source changes.

Should I try to push my modification of
src/gov/nist/javax/sdp/parser/MediaFieldParser.java upstream?

Yes, as I remember it was a bug fix, right?

Regards
damencho

Best regards,
Lyubo Marinov

_______________________________________________
dev mailing list
dev@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/dev

_______________________________________________
dev mailing list
dev@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/dev


#4

Damencho, did you have a change to check whether that's been committed upstream?

···

2015-06-23 1:01 GMT-05:00 Damian Minkov <damencho@jitsi.org>:

I tried to figure out the following but I don't see it in the upstream
repository. There was a file rename though so that may have hindered
my search:

M src/gov/nist/javax/sip/stack/SIPServerTransaction.java

I also need to check it. I have added those due to packet logging and
I think everything was added into upstream.


#5

Sorry, just picked up on this discussion. Had a likewise problem so asked Jean Deruelle for explanation. His reply:

The subversion repo is the authorative official place for jain-sip indeed, you should check the corresponding authorative jain sip CI job then https://jsip.ci.cloudbees.com/job/jsip/

We created a mirror on https://code.google.com/p/jain-sip/ so that we can use git instead of SVN and Maven instead of Ant as build tool and also to have better control of releases and tagging that makes it into Mobicents specifically which is why we have our own CI job as well that does automatic tagging and maven push https://mobicents.ci.cloudbees.com/job/JAIN-SIP/.
It is also a placeholder for extensions not meaningful to JAIN SIP. We will move soon this repo to github given that Google Code will shutdown next year.

Hope his clarifies,
   Tom.

···

-----Original Message-----
From: dev [mailto:dev-bounces@jitsi.org] On Behalf Of Ingo Bauersachs
Sent: dinsdag 23 juni 2015 8:30
To: Jitsi Developers
Subject: Re: [jitsi-dev] jsip forked?

Hey

Just a comment: Mobicents already maintains a mirror of jsip on GitHub. It
may make more sense to fork their repo and create a branch based on rev.
1829 where we apply our changes.

Btw, this lib hasn't been updated from upstream in a long time. What are the
chances we could do that at some point?

Ingo

Freundliche Grüsse,
Ingo Bauersachs

-- sent from my mobile

> On 23.06.2015, at 11:34, Damian Minkov <damencho@jitsi.org> wrote:
>
> Hi,
>
> On Mon, Jun 22, 2015 at 10:50 PM, Lyubomir Marinov > > <lyubomir.marinov@jitsi.org> wrote:
>> Dear developers,
>>
>> We have jain-sip-src-1.2.159.zip and jsip.zip in libsrc.
>>
>> I confirmed with damencho that jain-sip-src-1.2.159.zip has been
>> obsoleted so I'm going to delete it.
>>
>> I'm trying hard to figure out jsip.zip though. It appears to be a SVN
>> checkout at revision 1829 with the following changes:
>>
>> ! ant-tasks
>> M build.xml
>> M src/gov/nist/core/LexerCore.java
>> M src/gov/nist/javax/sdp/parser/MediaFieldParser.java
>> M src/gov/nist/javax/sip/Utils.java
>> M src/gov/nist/javax/sip/header/Protocol.java
>> M src/gov/nist/javax/sip/parser/Lexer.java
>> M src/gov/nist/javax/sip/stack/SIPServerTransaction.java
>> M src/gov/nist/javax/sip/stack/SIPTransactionStack.java
>>
>> I've changed the following and I know I haven't submitted it upstream:
>>
>> M src/gov/nist/javax/sdp/parser/MediaFieldParser.java
>>
>> I believe the following have been committed upstream in revision 2312
>> (and there are other modifications to the files between revisions
>> 1829 and 2312):
>>
>> M src/gov/nist/core/LexerCore.java
>> M src/gov/nist/javax/sip/Utils.java
>> M src/gov/nist/javax/sip/header/Protocol.java
>> M src/gov/nist/javax/sip/parser/Lexer.java
>> M src/gov/nist/javax/sip/stack/SIPTransactionStack.java
>>
>> I tried to figure out the following but I don't see it in the
>> upstream repository. There was a file rename though so that may have
>> hindered my search:
>>
>> M src/gov/nist/javax/sip/stack/SIPServerTransaction.java
>
> I also need to check it. I have added those due to packet logging and
> I think everything was added into upstream.
>
>>
>> It's an addition on our side or a removal on theirs:
>>
>> <
>> < lastReparsedResponse.setRemoteAddress(
>> < this.getPeerInetAddress());
>> <
>> lastReparsedResponse.setRemotePort(this.getPeerPort());
>> < lastReparsedResponse.setLocalPort(
>> < getMessageChannel().getPort());
>> < lastReparsedResponse.setLocalAddress(
>> < getMessageChannel()
>> < .getMessageProcessor().getIpAddress());
>> <
>> 1234,1244d1223
>> <
>> < lastReparsedResponse.setRemoteAddress(
>> < this.getPeerInetAddress());
>> < lastReparsedResponse.setRemotePort
>> < (this.getPeerPort());
>> < lastReparsedResponse.setLocalPort(
>> < getMessageChannel().getPort());
>> < lastReparsedResponse.setLocalAddress(
>> < getMessageChannel()
>> <
>> .getMessageProcessor().getIpAddress());
>> <
>>
>> The following are not in the upstream repository for sure because
>> they are commented code and a directory removal:
>>
>> ! ant-tasks
>> M build.xml
>
> Well this was my work while doing the debian src package. When we make
> it using maven I can change this and for debian src so we can skip
> those changes.
>
>>
>> Should I fork the jsip project at SVN revision 1829 in a GitHub
>> repository of ours and apply our changes there?
>
> I think so, and just the source changes.
>
>>
>> Should I try to push my modification of
>> src/gov/nist/javax/sdp/parser/MediaFieldParser.java upstream?
>
> Yes, as I remember it was a bug fix, right?
>
> Regards
> damencho
>
>>
>> Best regards,
>> Lyubo Marinov
>>
>> _______________________________________________
>> dev mailing list
>> dev@jitsi.org
>> Unsubscribe instructions and other list options:
>> http://lists.jitsi.org/mailman/listinfo/dev
>
> _______________________________________________
> dev mailing list
> dev@jitsi.org
> Unsubscribe instructions and other list options:
> http://lists.jitsi.org/mailman/listinfo/dev

_______________________________________________
dev mailing list
dev@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/dev


#6

Hi all,

I confirm the below message from Tom. An update on this also

The move of our git mirror of the official jain sip SVN repo to github is
now effective https://github.com/Mobicents/jain-sip/. Any fixes made from
the Mobicents community to the github repo is pushed back upstream to the
official JAIN SIP repo via gitsvn tool. So we make sure things stay in sync
as much as possible and everything is contributed back to the upstream but
I want to reiterate it's not a fork, we just think using git is more
practical for us.

The Mobicents extensions to JAIN SIP have been moved in their own dedicated
github repo ie https://github.com/Mobicents/jain-sip.ext and
https://github.com/Mobicents/jain-sip.ha

I would encourage to have your own fork modifications discussed in the JAIN
SIP mailing list so they get included and so you don't have to maintain
your own fork

Best Regards
Jean

···

On Tue, Jun 23, 2015 at 10:00 AM, Tom Uijldert <tom.uijldert@gmail.com> wrote:

Sorry, just picked up on this discussion. Had a likewise problem so asked
Jean Deruelle for explanation. His reply:

> The subversion repo is the authorative official place for jain-sip
indeed, you should check the corresponding authorative jain sip CI job then
https://jsip.ci.cloudbees.com/job/jsip/

> We created a mirror on https://code.google.com/p/jain-sip/ so that we
can use git instead of SVN and Maven instead of Ant as build tool and also
to have better control of releases and tagging that makes it into Mobicents
specifically which is why we have our own CI job as well that does
automatic tagging and maven push
https://mobicents.ci.cloudbees.com/job/JAIN-SIP/.
> It is also a placeholder for extensions not meaningful to JAIN SIP. We
will move soon this repo to github given that Google Code will shutdown
next year.

Hope his clarifies,
   Tom.

> -----Original Message-----
> From: dev [mailto:dev-bounces@jitsi.org] On Behalf Of Ingo Bauersachs
> Sent: dinsdag 23 juni 2015 8:30
> To: Jitsi Developers
> Subject: Re: [jitsi-dev] jsip forked?
>
> Hey
>
> Just a comment: Mobicents already maintains a mirror of jsip on GitHub.
It
> may make more sense to fork their repo and create a branch based on rev.
> 1829 where we apply our changes.
>
> Btw, this lib hasn't been updated from upstream in a long time. What are
the
> chances we could do that at some point?
>
> Ingo
>
> Freundliche Grüsse,
> Ingo Bauersachs
>
> -- sent from my mobile
>
> > On 23.06.2015, at 11:34, Damian Minkov <damencho@jitsi.org> wrote:
> >
> > Hi,
> >
> > On Mon, Jun 22, 2015 at 10:50 PM, Lyubomir Marinov > > > <lyubomir.marinov@jitsi.org> wrote:
> >> Dear developers,
> >>
> >> We have jain-sip-src-1.2.159.zip and jsip.zip in libsrc.
> >>
> >> I confirmed with damencho that jain-sip-src-1.2.159.zip has been
> >> obsoleted so I'm going to delete it.
> >>
> >> I'm trying hard to figure out jsip.zip though. It appears to be a SVN
> >> checkout at revision 1829 with the following changes:
> >>
> >> ! ant-tasks
> >> M build.xml
> >> M src/gov/nist/core/LexerCore.java
> >> M src/gov/nist/javax/sdp/parser/MediaFieldParser.java
> >> M src/gov/nist/javax/sip/Utils.java
> >> M src/gov/nist/javax/sip/header/Protocol.java
> >> M src/gov/nist/javax/sip/parser/Lexer.java
> >> M src/gov/nist/javax/sip/stack/SIPServerTransaction.java
> >> M src/gov/nist/javax/sip/stack/SIPTransactionStack.java
> >>
> >> I've changed the following and I know I haven't submitted it upstream:
> >>
> >> M src/gov/nist/javax/sdp/parser/MediaFieldParser.java
> >>
> >> I believe the following have been committed upstream in revision 2312
> >> (and there are other modifications to the files between revisions
> >> 1829 and 2312):
> >>
> >> M src/gov/nist/core/LexerCore.java
> >> M src/gov/nist/javax/sip/Utils.java
> >> M src/gov/nist/javax/sip/header/Protocol.java
> >> M src/gov/nist/javax/sip/parser/Lexer.java
> >> M src/gov/nist/javax/sip/stack/SIPTransactionStack.java
> >>
> >> I tried to figure out the following but I don't see it in the
> >> upstream repository. There was a file rename though so that may have
> >> hindered my search:
> >>
> >> M src/gov/nist/javax/sip/stack/SIPServerTransaction.java
> >
> > I also need to check it. I have added those due to packet logging and
> > I think everything was added into upstream.
> >
> >>
> >> It's an addition on our side or a removal on theirs:
> >>
> >> <
> >> < lastReparsedResponse.setRemoteAddress(
> >> < this.getPeerInetAddress());
> >> <
> >> lastReparsedResponse.setRemotePort(this.getPeerPort());
> >> < lastReparsedResponse.setLocalPort(
> >> < getMessageChannel().getPort());
> >> < lastReparsedResponse.setLocalAddress(
> >> < getMessageChannel()
> >> <
.getMessageProcessor().getIpAddress());
> >> <
> >> 1234,1244d1223
> >> <
> >> < lastReparsedResponse.setRemoteAddress(
> >> < this.getPeerInetAddress());
> >> < lastReparsedResponse.setRemotePort
> >> < (this.getPeerPort());
> >> < lastReparsedResponse.setLocalPort(
> >> < getMessageChannel().getPort());
> >> < lastReparsedResponse.setLocalAddress(
> >> < getMessageChannel()
> >> <
> >> .getMessageProcessor().getIpAddress());
> >> <
> >>
> >> The following are not in the upstream repository for sure because
> >> they are commented code and a directory removal:
> >>
> >> ! ant-tasks
> >> M build.xml
> >
> > Well this was my work while doing the debian src package. When we make
> > it using maven I can change this and for debian src so we can skip
> > those changes.
> >
> >>
> >> Should I fork the jsip project at SVN revision 1829 in a GitHub
> >> repository of ours and apply our changes there?
> >
> > I think so, and just the source changes.
> >
> >>
> >> Should I try to push my modification of
> >> src/gov/nist/javax/sdp/parser/MediaFieldParser.java upstream?
> >
> > Yes, as I remember it was a bug fix, right?
> >
> > Regards
> > damencho
> >
> >>
> >> Best regards,
> >> Lyubo Marinov
> >>
> >> _______________________________________________
> >> dev mailing list
> >> dev@jitsi.org
> >> Unsubscribe instructions and other list options:
> >> http://lists.jitsi.org/mailman/listinfo/dev
> >
> > _______________________________________________
> > dev mailing list
> > dev@jitsi.org
> > Unsubscribe instructions and other list options:
> > http://lists.jitsi.org/mailman/listinfo/dev
>
> _______________________________________________
> dev mailing list
> dev@jitsi.org
> Unsubscribe instructions and other list options:
> http://lists.jitsi.org/mailman/listinfo/dev

_______________________________________________
dev mailing list
dev@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/dev


#7

Hey Lyubo,

it is committed upstream in (jsip svn r1829). Here are the links in
the fork for that commit:
https://github.com/jitsi/jain-sip/commit/7729f7a738afbafca56cc19d5dc39906d2ea99c2#diff-b18122dcdb794dc5251bcb066d216dd7R1198

https://github.com/jitsi/jain-sip/commit/7729f7a738afbafca56cc19d5dc39906d2ea99c2#diff-b18122dcdb794dc5251bcb066d216dd7R1234

We are using this particular version (from 2011-01-10 r1829, rev:
7729f7a738afbafca56cc19d5dc39906d2ea99c2 from our fork), but with one
more patch, which is added later in jsip:
https://github.com/jitsi/jain-sip/commit/89ede0faa342dd225ffd610067ecb9aec56649de

Regards
damencho

···

On Wed, Jun 24, 2015 at 1:32 AM, Lyubomir Marinov <lyubomir.marinov@jitsi.org> wrote:

2015-06-23 1:01 GMT-05:00 Damian Minkov <damencho@jitsi.org>:

I tried to figure out the following but I don't see it in the upstream
repository. There was a file rename though so that may have hindered
my search:

M src/gov/nist/javax/sip/stack/SIPServerTransaction.java

I also need to check it. I have added those due to packet logging and
I think everything was added into upstream.

Damencho, did you have a change to check whether that's been committed upstream?

_______________________________________________
dev mailing list
dev@jitsi.org
Unsubscribe instructions and other list options:
http://lists.jitsi.org/mailman/listinfo/dev


#8

Thank you, Damencho!

it is committed upstream in (jsip svn r1829). Here are the links in
the fork for that commit:
https://github.com/jitsi/jain-sip/commit/7729f7a738afbafca56cc19d5dc39906d2ea99c2#diff-b18122dcdb794dc5251bcb066d216dd7R1198

https://github.com/jitsi/jain-sip/commit/7729f7a738afbafca56cc19d5dc39906d2ea99c2#diff-b18122dcdb794dc5251bcb066d216dd7R1234

That's what I said in my first e-mail in this thread. Our jitsi branch
of jitsi/jain-sip branches from there so I know that's there.

We are using this particular version (from 2011-01-10 r1829, rev:
7729f7a738afbafca56cc19d5dc39906d2ea99c2 from our fork), but with one
more patch, which is added later in jsip:
https://github.com/jitsi/jain-sip/commit/89ede0faa342dd225ffd610067ecb9aec56649de

That's what I said in my first e-mail in this thread. That's jsip SVN
revision 2312 and our jitsi branch of jitsi/jain-sip cherry-picked it
as commit 9ff5c5a7b67954cdc2857fbbd429eb8c859b8b39.

What I was asking about was the following change which I haven't
located upstream yet.

--- /Users/lmarinov/Documents/jain-sip/src/gov/nist/javax/sip/stack/SIPServerTransaction.java
2015-06-23 17:02:25.000000000 -0500
+++ /Users/lmarinov/Documents/libsrc/jsip.zip_FILES/jsip/src/gov/nist/javax/sip/stack/SIPServerTransaction.java
2012-02-24 07:35:32.000000000 -0600
@@ -1201,16 +1201,6 @@
                     // Issue 343 : we have to log the retransmission
                     try {
                         SIPResponse lastReparsedResponse =
(SIPResponse) sipStack.getMessageParserFactory().createMessageParser(sipStack).parseSIPMessage(lastResponseAsBytes,
true, false, null);

···

2015-06-24 4:08 GMT-05:00 Damian Minkov <damencho@jitsi.org>:
-
- lastReparsedResponse.setRemoteAddress(
- this.getPeerInetAddress());
- lastReparsedResponse.setRemotePort(this.getPeerPort());
- lastReparsedResponse.setLocalPort(
- getMessageChannel().getPort());
- lastReparsedResponse.setLocalAddress(
- getMessageChannel()
- .getMessageProcessor().getIpAddress());
-

getMessageChannel().logMessage(lastReparsedResponse,
this.getPeerInetAddress(), this.getPeerPort(),
System.currentTimeMillis());
                     } catch (ParseException e) {
                         if (logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
@@ -1231,17 +1221,6 @@
                         // Issue 343 : we have to log the retransmission
                         try {
                             SIPResponse lastReparsedResponse =
(SIPResponse) sipStack.getMessageParserFactory().createMessageParser(sipStack).parseSIPMessage(lastResponseAsBytes,
true, false, null);
-
- lastReparsedResponse.setRemoteAddress(
- this.getPeerInetAddress());
- lastReparsedResponse.setRemotePort
- (this.getPeerPort());
- lastReparsedResponse.setLocalPort(
- getMessageChannel().getPort());
- lastReparsedResponse.setLocalAddress(
- getMessageChannel()
- .getMessageProcessor().getIpAddress());
-

getMessageChannel().logMessage(lastReparsedResponse,
this.getPeerInetAddress(), this.getPeerPort(),
System.currentTimeMillis());
                         } catch (ParseException e) {
                             if
(logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {

Anyway, I'll deal with it myself.


#9

Thank you very much everyone for the prompt and constructive
participation in this discussion. We now have a jitsi branch in the
jitsi/jain-sip fork of the Mobicents/jain-sip GitHub project which is
equivalent to the contents of jitsi/libsrc/jain.sip.