Merge in DNS/adguard-home from 4166-udp-upstream to master
Closes #4166.
Squashed commit of the following:
commit b8b6d1c7ac1e11e83c0c68e46e7f66fdc6043839
Merge: e5f01273 ea6e033d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 1 20:36:40 2022 +0300
Merge branch 'master' into 4166-udp-upstream
commit e5f0127384d84c4395da5b79a1fd4a47acbe122c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 1 19:41:33 2022 +0300
client: upd upstream examples
commit bd974f22231f11f4c57e19d6d13bc45dbfdf2fdf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Mar 1 18:36:10 2022 +0300
all: upd proxy
commit badf1325090ecd1dc86e42e7406dfb6653e07bf1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Feb 4 14:36:50 2022 +0300
WIP
148 lines
5.3 KiB
JavaScript
148 lines
5.3 KiB
JavaScript
import React from 'react';
|
|
import PropTypes from 'prop-types';
|
|
import { Trans, withTranslation } from 'react-i18next';
|
|
import { COMMENT_LINE_DEFAULT_TOKEN } from '../../../../helpers/constants';
|
|
|
|
const Examples = (props) => (
|
|
<div className="list leading-loose">
|
|
<Trans>examples_title</Trans>:
|
|
<ol className="leading-loose">
|
|
<li>
|
|
<code>94.140.14.140</code>: {props.t('example_upstream_regular')}
|
|
</li>
|
|
<li>
|
|
<code>udp://dns-unfiltered.adguard.com</code>: <Trans>example_upstream_udp</Trans>
|
|
</li>
|
|
<li>
|
|
<code>tcp://94.140.14.140</code>: <Trans>example_upstream_tcp</Trans>
|
|
</li>
|
|
<li>
|
|
<code>tcp://dns-unfiltered.adguard.com</code>: <Trans>example_upstream_tcp_hostname</Trans>
|
|
</li>
|
|
<li>
|
|
<code>tls://dns-unfiltered.adguard.com</code>:
|
|
<span>
|
|
<Trans
|
|
components={[
|
|
<a
|
|
href="https://en.wikipedia.org/wiki/DNS_over_TLS"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
key="0"
|
|
>
|
|
DNS-over-TLS
|
|
</a>,
|
|
]}
|
|
>
|
|
example_upstream_dot
|
|
</Trans>
|
|
</span>
|
|
</li>
|
|
<li>
|
|
<code>https://dns-unfiltered.adguard.com/dns-query</code>:
|
|
<span>
|
|
<Trans
|
|
components={[
|
|
<a
|
|
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
key="0"
|
|
>
|
|
DNS-over-HTTPS
|
|
</a>,
|
|
]}
|
|
>
|
|
example_upstream_doh
|
|
</Trans>
|
|
</span>
|
|
</li>
|
|
<li>
|
|
<code>quic://dns-unfiltered.adguard.com:784</code>:
|
|
<span>
|
|
<Trans
|
|
components={[
|
|
<a
|
|
href="https://tools.ietf.org/html/draft-huitema-quic-dnsoquic-07"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
key="0"
|
|
>
|
|
DNS-over-QUIC
|
|
</a>,
|
|
]}
|
|
>
|
|
example_upstream_doq
|
|
</Trans>
|
|
</span>
|
|
</li>
|
|
<li>
|
|
<code>sdns://...</code>:
|
|
<span>
|
|
<Trans
|
|
components={[
|
|
<a
|
|
href="https://dnscrypt.info/stamps/"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
key="0"
|
|
>
|
|
DNS Stamps
|
|
</a>,
|
|
<a
|
|
href="https://dnscrypt.info/"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
key="1"
|
|
>
|
|
DNSCrypt
|
|
</a>,
|
|
<a
|
|
href="https://en.wikipedia.org/wiki/DNS_over_HTTPS"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
key="2"
|
|
>
|
|
DNS-over-HTTPS
|
|
</a>,
|
|
]}
|
|
>
|
|
example_upstream_sdns
|
|
</Trans>
|
|
</span>
|
|
</li>
|
|
<li>
|
|
<code>[/example.local/]94.140.14.140</code>:
|
|
<span>
|
|
<Trans
|
|
components={[
|
|
<a
|
|
href="https://github.com/AdguardTeam/AdGuardHome/wiki/Configuration#upstreams-for-domains"
|
|
target="_blank"
|
|
rel="noopener noreferrer"
|
|
key="0"
|
|
>
|
|
Link
|
|
</a>,
|
|
]}
|
|
>
|
|
example_upstream_reserved
|
|
</Trans>
|
|
</span>
|
|
</li>
|
|
<li>
|
|
<code>{COMMENT_LINE_DEFAULT_TOKEN} comment</code>:
|
|
<span>
|
|
<Trans>example_upstream_comment</Trans>
|
|
</span>
|
|
</li>
|
|
</ol>
|
|
</div>
|
|
);
|
|
|
|
Examples.propTypes = {
|
|
t: PropTypes.func.isRequired,
|
|
};
|
|
|
|
export default withTranslation()(Examples);
|