You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/08/22 01:04:01 UTC
[1/2] git commit: remove unnecessary Connection::setup_mc_send()
compatibility wrapper
Updated Branches:
refs/heads/master 87ccd262e -> 9e6ad5cdf
remove unnecessary Connection::setup_mc_send() compatibility wrapper
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9e6ad5cd
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9e6ad5cd
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9e6ad5cd
Branch: refs/heads/master
Commit: 9e6ad5cdf1fe903ef1d6be4f72c79f90a21f89a5
Parents: 36059e2
Author: James Peach <jp...@apache.org>
Authored: Wed Aug 21 15:58:52 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Wed Aug 21 16:01:13 2013 -0700
----------------------------------------------------------------------
iocore/net/P_Connection.h | 22 ----------------------
1 file changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9e6ad5cd/iocore/net/P_Connection.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_Connection.h b/iocore/net/P_Connection.h
index e974a37..7abaa8e 100644
--- a/iocore/net/P_Connection.h
+++ b/iocore/net/P_Connection.h
@@ -130,28 +130,6 @@ struct Connection
bool non_blocking = NON_BLOCKING,
unsigned char mc_ttl = 1, bool mc_loopback = DISABLE_MC_LOOPBACK, Continuation * c = NULL);
- /**
- @deprecated preserve backward compatibility with non-IPv6 iocore
- */
-
- int setup_mc_send(unsigned int mc_ip, int mc_port,
- unsigned int my_ip, int my_port,
- bool non_blocking = NON_BLOCKING,
- unsigned char mc_ttl = 1, bool mc_loopback = DISABLE_MC_LOOPBACK, Continuation * c = NULL)
- {
- struct sockaddr_in mc_addr;
- struct sockaddr_in my_addr;
-
- ats_ip4_set(&mc_addr, mc_ip, htons(mc_port));
- ats_ip4_set(&my_addr, my_ip, htons(my_port));
-
- return setup_mc_send(
- ats_ip_sa_cast(&mc_addr),
- ats_ip_sa_cast(&my_addr),
- non_blocking, mc_ttl, mc_loopback, c);
- }
-
-
int setup_mc_receive(sockaddr const* from,
bool non_blocking = NON_BLOCKING, Connection * sendchan = NULL, Continuation * c = NULL);
Re: [2/2] git commit: TS-2116: create buffer_upload temp files with
mode 0600
Posted by James Peach <ja...@me.com>.
On Aug 22, 2013, at 12:18 AM, Igor Galić <i....@brainsware.org> wrote:
>
>
> ----- Original Message -----
>> TS-2116: create buffer_upload temp files with mode 0600
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/36059e20
>> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/36059e20
>> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/36059e20
>>
>> Branch: refs/heads/master
>> Commit: 36059e207307e90be17871ba5ddeb72ceecc4193
>> Parents: 87ccd26
>> Author: James Peach <jp...@apache.org>
>> Authored: Wed Aug 21 16:00:41 2013 -0700
>> Committer: James Peach <jp...@apache.org>
>> Committed: Wed Aug 21 16:01:13 2013 -0700
>>
>> ----------------------------------------------------------------------
>> plugins/experimental/buffer_upload/buffer_upload.cc | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> ----------------------------------------------------------------------
>>
>>
>> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36059e20/plugins/experimental/buffer_upload/buffer_upload.cc
>> ----------------------------------------------------------------------
>> diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc
>> b/plugins/experimental/buffer_upload/buffer_upload.cc
>> index ae82135..fc496e4 100644
>> --- a/plugins/experimental/buffer_upload/buffer_upload.cc
>> +++ b/plugins/experimental/buffer_upload/buffer_upload.cc
>> @@ -916,7 +916,7 @@ attach_pvc_plugin(TSCont /* contp ATS_UNUSED */, TSEvent
>> event, void *edata)
>> my_state->filename = tempnam(path, NULL);
>> TSDebug(DEBUG_TAG, "temp filename: %s", my_state->filename);
>>
>> - my_state->fd = open(my_state->filename, O_RDWR | O_NONBLOCK | O_TRUNC
>> | O_CREAT);
>> + my_state->fd = open(my_state->filename, O_RDWR | O_NONBLOCK | O_TRUNC
>> | O_CREAT, 0600);
>> if (my_state->fd < 0) {
>> LOG_ERROR("open");
>> uconfig->use_disk_buffer = 0;
>>
>
>
> reminder, there's still this beauty here: https://issues.apache.org/jira/browse/TS-2115
Yup, I only made this change because it broke the build farm :)
J
Re: [2/2] git commit: TS-2116: create buffer_upload temp files with
mode 0600
Posted by Igor Galić <i....@brainsware.org>.
----- Original Message -----
> TS-2116: create buffer_upload temp files with mode 0600
>
>
> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/36059e20
> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/36059e20
> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/36059e20
>
> Branch: refs/heads/master
> Commit: 36059e207307e90be17871ba5ddeb72ceecc4193
> Parents: 87ccd26
> Author: James Peach <jp...@apache.org>
> Authored: Wed Aug 21 16:00:41 2013 -0700
> Committer: James Peach <jp...@apache.org>
> Committed: Wed Aug 21 16:01:13 2013 -0700
>
> ----------------------------------------------------------------------
> plugins/experimental/buffer_upload/buffer_upload.cc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36059e20/plugins/experimental/buffer_upload/buffer_upload.cc
> ----------------------------------------------------------------------
> diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc
> b/plugins/experimental/buffer_upload/buffer_upload.cc
> index ae82135..fc496e4 100644
> --- a/plugins/experimental/buffer_upload/buffer_upload.cc
> +++ b/plugins/experimental/buffer_upload/buffer_upload.cc
> @@ -916,7 +916,7 @@ attach_pvc_plugin(TSCont /* contp ATS_UNUSED */, TSEvent
> event, void *edata)
> my_state->filename = tempnam(path, NULL);
> TSDebug(DEBUG_TAG, "temp filename: %s", my_state->filename);
>
> - my_state->fd = open(my_state->filename, O_RDWR | O_NONBLOCK | O_TRUNC
> | O_CREAT);
> + my_state->fd = open(my_state->filename, O_RDWR | O_NONBLOCK | O_TRUNC
> | O_CREAT, 0600);
> if (my_state->fd < 0) {
> LOG_ERROR("open");
> uconfig->use_disk_buffer = 0;
>
reminder, there's still this beauty here: https://issues.apache.org/jira/browse/TS-2115
--
Igor Galić
Tel: +43 (0) 664 886 22 883
Mail: i.galic@brainsware.org
URL: http://brainsware.org/
GPG: 6880 4155 74BD FD7C B515 2EA5 4B1D 9E08 A097 C9AE
[2/2] git commit: TS-2116: create buffer_upload temp files with mode
0600
Posted by jp...@apache.org.
TS-2116: create buffer_upload temp files with mode 0600
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/36059e20
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/36059e20
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/36059e20
Branch: refs/heads/master
Commit: 36059e207307e90be17871ba5ddeb72ceecc4193
Parents: 87ccd26
Author: James Peach <jp...@apache.org>
Authored: Wed Aug 21 16:00:41 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Wed Aug 21 16:01:13 2013 -0700
----------------------------------------------------------------------
plugins/experimental/buffer_upload/buffer_upload.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/36059e20/plugins/experimental/buffer_upload/buffer_upload.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/buffer_upload/buffer_upload.cc b/plugins/experimental/buffer_upload/buffer_upload.cc
index ae82135..fc496e4 100644
--- a/plugins/experimental/buffer_upload/buffer_upload.cc
+++ b/plugins/experimental/buffer_upload/buffer_upload.cc
@@ -916,7 +916,7 @@ attach_pvc_plugin(TSCont /* contp ATS_UNUSED */, TSEvent event, void *edata)
my_state->filename = tempnam(path, NULL);
TSDebug(DEBUG_TAG, "temp filename: %s", my_state->filename);
- my_state->fd = open(my_state->filename, O_RDWR | O_NONBLOCK | O_TRUNC | O_CREAT);
+ my_state->fd = open(my_state->filename, O_RDWR | O_NONBLOCK | O_TRUNC | O_CREAT, 0600);
if (my_state->fd < 0) {
LOG_ERROR("open");
uconfig->use_disk_buffer = 0;