pkg: retire backwards compatibility bootstrap support
ClosedPublic
Actions

Authored by emaste on Oct 7 2024, 5:14 PM.

Details

Reviewers

bapt
bdrewery

Commits

rG0cd9513a5ba5: pkg: retire backwards compatibility bootstrap support

Summary

pkg.pkg has been available for years and is the default in all supported
releases.  Retire fallback support for pkg.txz.

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

emaste created this revision.Oct 7 2024, 5:14 PM

Herald added a reviewer: bdrewery. · View Herald TranscriptOct 7 2024, 5:14 PM

emaste requested review of this revision.Oct 7 2024, 5:14 PM

emaste added inline comments.

usr.sbin/pkg/pkg.c
94	oups! this should be pkg.pkg, of course

Use correct filename

bapt accepted this revision.Oct 8 2024, 4:42 AM

This revision is now accepted and ready to land.Oct 8 2024, 4:42 AM

rebase

This revision now requires review to proceed.Jan 14 2025, 1:11 PM

bapt accepted this revision.Jan 14 2025, 1:40 PM

This revision is now accepted and ready to land.Jan 14 2025, 1:40 PM

Closed by commit rG0cd9513a5ba5: pkg: retire backwards compatibility bootstrap support (authored by emaste). · Explain WhyJan 14 2025, 1:43 PM

This revision was automatically updated to reflect the committed changes.

emaste added a commit: rG0cd9513a5ba5: pkg: retire backwards compatibility bootstrap support.

Herald added a subscriber: imp. · View Herald TranscriptJan 14 2025, 1:43 PM

Revision Contents
Changeset List

Path

Size

usr.sbin/

pkg/

pkg.c

29 lines

Diff 149225

View Options

usr.sbin/pkg/pkg.c

Show All 36 Lines
#include <sys/mutex.h>		#include <sys/mutex.h>
#include <sys/pcpu.h>		#include <sys/pcpu.h>
#include <sys/proc.h>		#include <sys/proc.h>
#include <sys/socket.h>		#include <sys/socket.h>
#include <sys/socketvar.h>		#include <sys/socketvar.h>
#include <sys/time.h>		#include <sys/time.h>
#include <sys/uio.h>		#include <sys/uio.h>

		#include <netinet/tcp.h>

#include <rpc/rpc.h>		#include <rpc/rpc.h>
#include <rpc/rpc_com.h>		#include <rpc/rpc_com.h>
#include <rpc/krpc.h>		#include <rpc/krpc.h>
#include <rpc/rpcsec_tls.h>		#include <rpc/rpcsec_tls.h>

static enum clnt_stat clnt_reconnect_call(CLIENT , struct rpc_callextra ,		static enum clnt_stat clnt_reconnect_call(CLIENT , struct rpc_callextra ,
rpcproc_t, struct mbuf , struct mbuf *, struct timeval);		rpcproc_t, struct mbuf , struct mbuf *, struct timeval);
static void clnt_reconnect_geterr(CLIENT , struct rpc_err );		static void clnt_reconnect_geterr(CLIENT , struct rpc_err );
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Lines	clnt_reconnect_create(
rc->rc_retries = INT_MAX;		rc->rc_retries = INT_MAX;
rc->rc_privport = FALSE;		rc->rc_privport = FALSE;
rc->rc_waitchan = "rpcrecv";		rc->rc_waitchan = "rpcrecv";
rc->rc_intr = 0;		rc->rc_intr = 0;
rc->rc_connecting = FALSE;		rc->rc_connecting = FALSE;
rc->rc_closed = FALSE;		rc->rc_closed = FALSE;
rc->rc_ucred = crdup(curthread->td_ucred);		rc->rc_ucred = crdup(curthread->td_ucred);
rc->rc_client = NULL;		rc->rc_client = NULL;
		rc->rc_ddp = false;
rc->rc_tls = false;		rc->rc_tls = false;
rc->rc_tlscertname = NULL;		rc->rc_tlscertname = NULL;
rc->rc_reconcall = NULL;		rc->rc_reconcall = NULL;
rc->rc_reconarg = NULL;		rc->rc_reconarg = NULL;

cl->cl_refs = 1;		cl->cl_refs = 1;
cl->cl_ops = &clnt_reconnect_ops;		cl->cl_ops = &clnt_reconnect_ops;
cl->cl_private = (caddr_t)(void *)rc;		cl->cl_private = (caddr_t)(void *)rc;
▲ Show 20 Lines • Show All 90 Lines • ▼ Show 20 Lines	if (rc->rc_tls && newclient != NULL) {
rpc_createerr.cf_error.re_errno = 0;		rpc_createerr.cf_error.re_errno = 0;
CLNT_CLOSE(newclient);		CLNT_CLOSE(newclient);
CLNT_RELEASE(newclient);		CLNT_RELEASE(newclient);
newclient = NULL;		newclient = NULL;
td->td_ucred = oldcred;		td->td_ucred = oldcred;
goto out;		goto out;
}		}
}		}
		if (rc->rc_ddp && newclient != NULL) {
		int optval = 1;

		(void)so_setsockopt(so, IPPROTO_TCP, TCP_USE_DDP,
		&optval, sizeof(optval));
		}
		rmacklemUnsubmitted Not Done Inline Actions Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would be done for CLSET_TCP_DDP in clnt_vc.c and ignored in clnt_dg.c. I've never been much of an object oriented guy, but the Sun folk loved these layers. rmacklem: Normally the clnt_rc.c (reconnect layer) would do a CLSET_TCP_DDP and the so_setsockopt() would…
if (newclient != NULL && rc->rc_reconcall != NULL)		if (newclient != NULL && rc->rc_reconcall != NULL)
(*rc->rc_reconcall)(newclient, rc->rc_reconarg,		(*rc->rc_reconcall)(newclient, rc->rc_reconarg,
rc->rc_ucred);		rc->rc_ucred);
}		}
td->td_ucred = oldcred;		td->td_ucred = oldcred;

if (!newclient) {		if (!newclient) {
soclose(so);		soclose(so);
▲ Show 20 Lines • Show All 292 Lines • ▼ Show 20 Lines	case CLSET_TLSCERTNAME:
rc->rc_tlscertname = mem_alloc(slen);		rc->rc_tlscertname = mem_alloc(slen);
strlcpy(rc->rc_tlscertname, info, slen);		strlcpy(rc->rc_tlscertname, info, slen);
break;		break;

case CLSET_RECONUPCALL:		case CLSET_RECONUPCALL:
upcp = (struct rpc_reconupcall *)info;		upcp = (struct rpc_reconupcall *)info;
rc->rc_reconcall = upcp->call;		rc->rc_reconcall = upcp->call;
rc->rc_reconarg = upcp->arg;		rc->rc_reconarg = upcp->arg;
		break;

		case CLSET_DDP:
		rc->rc_ddp = true;
break;		break;

default:		default:
return (FALSE);		return (FALSE);
}		}

return (TRUE);		return (TRUE);
}		}
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines

pkg: retire backwards compatibility bootstrap supportClosedPublicActions